diff 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
line wrap: on
line diff
--- a/mxtool/mx.py	Tue Apr 23 20:16:34 2013 +0200
+++ b/mxtool/mx.py	Tue Apr 23 20:16:45 2013 +0200
@@ -980,11 +980,14 @@
     for arg in args:
         assert isinstance(arg, types.StringTypes), 'argument is not a string: ' + str(arg)
 
+    if env is None:
+        env = os.environ
+        
     if _opts.verbose:
         if _opts.very_verbose:
             log('Environment variables:')
-            for key in sorted(os.environ.keys()):
-                log('    ' + key + '=' + os.environ[key])
+            for key in sorted(env.keys()):
+                log('    ' + key + '=' + env[key])
         log(' '.join(args))
 
     if timeout is None and _opts.ptimeout != 0: