[GRASS-SVN] r62701 - grass-addons/grass7/raster/r.basin

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-11-11 03:30:15 -0800 (Tue, 11 Nov 2014)
New Revision: 62701

Modified:
   grass-addons/grass7/raster/r.basin/r.basin.py
Log:
r.basin: loop over all dependencies at start

Modified: grass-addons/grass7/raster/r.basin/r.basin.py
===================================================================
--- grass-addons/grass7/raster/r.basin/r.basin.py	2014-11-11 10:34:52 UTC (rev 62700)
+++ grass-addons/grass7/raster/r.basin/r.basin.py	2014-11-11 11:30:15 UTC (rev 62701)
@@ -80,10 +80,14 @@
 
 # check requirements
 def check_progs():
+    found_missing = False
     for prog in ('r.hypso', 'r.stream.basins', 'r.stream.distance', 'r.stream.extract',
     'r.stream.order','r.stream.snap','r.stream.stats', 'r.width.funct'):
         if not grass.find_program(prog, '--help'):
-            grass.fatal(_("'%s' required. Please install '%s' first using 'g.extension %s'") % (prog, prog, prog))
+            found_missing = True
+            grass.warning(_("'%s' required. Please install '%s' first using 'g.extension %s'") % (prog, prog, prog))
+    if found_missing:
+        grass.error_("An ERROR occurred running r.basin")
 
 def main():
     # check dependencies