Mercurial > hg > truffle
comparison mxtool/mx.py @ 9274:90c3837d6a1c
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 23 Apr 2013 20:16:45 +0200 |
parents | 0f4ae7bbe062 |
children | cff647969dfa |
comparison
equal
deleted
inserted
replaced
9273:d27550f2f80f | 9274:90c3837d6a1c |
---|---|
978 | 978 |
979 assert isinstance(args, types.ListType), "'args' must be a list: " + str(args) | 979 assert isinstance(args, types.ListType), "'args' must be a list: " + str(args) |
980 for arg in args: | 980 for arg in args: |
981 assert isinstance(arg, types.StringTypes), 'argument is not a string: ' + str(arg) | 981 assert isinstance(arg, types.StringTypes), 'argument is not a string: ' + str(arg) |
982 | 982 |
983 if env is None: | |
984 env = os.environ | |
985 | |
983 if _opts.verbose: | 986 if _opts.verbose: |
984 if _opts.very_verbose: | 987 if _opts.very_verbose: |
985 log('Environment variables:') | 988 log('Environment variables:') |
986 for key in sorted(os.environ.keys()): | 989 for key in sorted(env.keys()): |
987 log(' ' + key + '=' + os.environ[key]) | 990 log(' ' + key + '=' + env[key]) |
988 log(' '.join(args)) | 991 log(' '.join(args)) |
989 | 992 |
990 if timeout is None and _opts.ptimeout != 0: | 993 if timeout is None and _opts.ptimeout != 0: |
991 timeout = _opts.ptimeout | 994 timeout = _opts.ptimeout |
992 | 995 |