[GRASS-SVN] r53512 - grass/branches/develbranch_6/gui/wxpython/core

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Oct 20 03:54:47 PDT 2012


Author: martinl
Date: 2012-10-20 03:54:47 -0700 (Sat, 20 Oct 2012)
New Revision: 53512

Modified:
   grass/branches/develbranch_6/gui/wxpython/core/gcmd.py
Log:
another attempt to fix #1692

Modified: grass/branches/develbranch_6/gui/wxpython/core/gcmd.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/core/gcmd.py	2012-10-20 10:30:59 UTC (rev 53511)
+++ grass/branches/develbranch_6/gui/wxpython/core/gcmd.py	2012-10-20 10:54:47 UTC (rev 53512)
@@ -31,6 +31,7 @@
 import signal
 import locale
 import traceback
+import copy
 
 import wx
 
@@ -531,6 +532,11 @@
         if sys.platform == 'win32' and os.getenv('GRASS_ADDON_PATH') and \
                 os.path.exists(os.path.join(os.getenv('GRASS_ADDON_PATH'), self.cmd[0] + '.bat')):
             args[0] = self.cmd[0] + '.bat'
+            env = copy.deepcopy(self.env)
+            env['PATH'] = os.path.join(os.getenv('GISBASE').replace('/', '\\'), 'scripts') + \
+                os.pathsep + env['PATH']
+        else:
+            env = self.env
         
         try:
             self.module = Popen(args,
@@ -538,7 +544,7 @@
                                 stdout = subprocess.PIPE,
                                 stderr = subprocess.PIPE,
                                 shell = sys.platform == "win32",
-                                env = self.env)
+                                env = env)
         
         except OSError, e:
             self.error = str(e)



More information about the grass-commit mailing list