[GRASS-SVN] r62823 - in grass/branches/releasebranch_7_0: . lib/python/script

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2014-11-19 18:34:20 -0800 (Wed, 19 Nov 2014)
New Revision: 62823

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/python/script/core.py
Log:
pythonlib/script: ignore any errors from g.version (backport of r62822)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812
   + /grass/trunk:60817,61096,61141,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822

Modified: grass/branches/releasebranch_7_0/lib/python/script/core.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/core.py	2014-11-20 02:32:43 UTC (rev 62822)
+++ grass/branches/releasebranch_7_0/lib/python/script/core.py	2014-11-20 02:34:20 UTC (rev 62823)
@@ -1464,7 +1464,7 @@
          'revision': '53670'}
 
     """
-    data = parse_command('g.version', flags='rge')
+    data = parse_command('g.version', flags='rge', errors='ignore')
     for k, v in data.iteritems():
         data[k.strip()] = v.replace('"', '').strip()