浏览代码

Revert more of https://trac.osgeo.org/grass/changeset/56800

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@56868 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 12 年之前
父节点
当前提交
c9e8b354fa
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      lib/python/script/core.py
  2. 1 1
      tools/thumbnails.py

+ 1 - 1
lib/python/script/core.py

@@ -1471,7 +1471,7 @@ def debug_level():
     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))
 
 

+ 1 - 1
tools/thumbnails.py

@@ -83,7 +83,7 @@ def flip_ppm(srcd):
     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')