[GRASS-SVN] r56868 - in grass/trunk: lib/python/script tools
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jun 21 09:19:29 PDT 2013
Author: glynn
Date: 2013-06-21 09:19:28 -0700 (Fri, 21 Jun 2013)
New Revision: 56868
Modified:
grass/trunk/lib/python/script/core.py
grass/trunk/tools/thumbnails.py
Log:
Revert more of r56800
Modified: grass/trunk/lib/python/script/core.py
===================================================================
--- grass/trunk/lib/python/script/core.py 2013-06-21 16:14:06 UTC (rev 56867)
+++ grass/trunk/lib/python/script/core.py 2013-06-21 16:19:28 UTC (rev 56868)
@@ -1471,7 +1471,7 @@
if _debug_level is not None:
return _debug_level
_debug_level = 0
- if find_program('g.gisenv'):
+ if find_program('g.gisenv', '--help'):
_debug_level = int(gisenv().get('DEBUG', 0))
Modified: grass/trunk/tools/thumbnails.py
===================================================================
--- grass/trunk/tools/thumbnails.py 2013-06-21 16:14:06 UTC (rev 56867)
+++ grass/trunk/tools/thumbnails.py 2013-06-21 16:19:28 UTC (rev 56868)
@@ -83,7 +83,7 @@
return dstd
def ppmtopng(dst, src):
- if grass.find_program("g.ppmtopng"):
+ if grass.find_program("g.ppmtopng", '--help'):
grass.run_command('g.ppmtopng', input = src, output = dst, quiet = True)
elif grass.find_program("pnmtopng"):
fh = open(dst, 'wb')
More information about the grass-commit
mailing list