damned-lies r1384 - in trunk: . stats

[claudep svn gnome org]

Author: claudep
Date: Fri Jan 23 16:42:21 2009
New Revision: 1384
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1384&view=rev

Log:
2009-01-23  Claude Paroz  <claude 2xlibre net>

	* stats/utils.py: When environment variable(s) are passed for Popen,
	merge them with	current environment instead of replacing it.

Modified:
   trunk/ChangeLog
   trunk/stats/utils.py

Modified: trunk/stats/utils.py
==============================================================================
--- trunk/stats/utils.py	(original)
+++ trunk/stats/utils.py	Fri Jan 23 16:42:21 2009
@@ -51,6 +51,9 @@
     stdin = None
     if input_data:
         stdin = PIPE
+    if env:
+        os.environ.update(env)
+        env = os.environ
     pipe = Popen(cmd, shell=True, env=env, stdin=stdin, stdout=PIPE, stderr=PIPE)
     if input_data:
         pipe.stdin.write(input_data)