[GRASS-SVN] r61059 - grass/trunk/lib/init

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-06-29 04:49:08 -0700 (Sun, 29 Jun 2014)
New Revision: 61059

Modified:
   grass/trunk/lib/init/grass.py
Log:
grass.py: do not override already set GRASS environmental variables
          (explain better)


Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2014-06-29 11:27:28 UTC (rev 61058)
+++ grass/trunk/lib/init/grass.py	2014-06-29 11:49:08 UTC (rev 61059)
@@ -1147,8 +1147,9 @@
             if ' ' in val:
                 val = '"%s"' % val
             f.write('export %s=%s\n' % (env, val))
-    #    if os.access(grass_env_file, os.R_OK):
-    #        f.write(readfile(grass_env_file) + '\n')
+    ### Replaced by code above (do not override already set up environment variables)
+    ###    if os.access(grass_env_file, os.R_OK):
+    ###        f.write(readfile(grass_env_file) + '\n')
 
     f.write("export PATH=\"%s\"\n" % os.getenv('PATH'))
     f.write("export HOME=\"%s\"\n" % userhome) # restore user home path