greentest/util.py: fix getname() helper

7a064348 · Denis Bilenko · aca345ff · 7a064348
Commit 7a064348 authored Oct 18, 2012 by Denis Bilenko
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

greentest/util.py greentest/util.py +3 -4

No files found.
--- a/greentest/util.py
+++ b/greentest/util.py
@@ -100,11 +100,10 @@ def kill(popen):
 def getname(command, env=None, setenv=None):
    result = []
-    for key, value in sorted((env or {}).items()):
+    env = (env or {}).copy()
-        if key.startswith('GEVENT_') or key.startswith('GEVENTARES_'):
+    env.update(setenv or {})
-            result.append('%s=%s' % (key, value))
-    for key, value in sorted((setenv or {}).items()):
+    for key, value in sorted(env.items()):
        if key.startswith('GEVENT_') or key.startswith('GEVENTARES_'):
            result.append('%s=%s' % (key, value))