[GRASS-SVN] r44503 - grass/trunk/scripts/v.krige

[svn_grass at osgeo.org]

Author: aghisla
Date: 2010-12-01 02:12:07 -0800 (Wed, 01 Dec 2010)
New Revision: 44503

Modified:
   grass/trunk/scripts/v.krige/v.krige.py
Log:
Better check of R packages: checked all in once, raising only one error message.

Modified: grass/trunk/scripts/v.krige/v.krige.py
===================================================================
--- grass/trunk/scripts/v.krige/v.krige.py	2010-12-01 09:50:49 UTC (rev 44502)
+++ grass/trunk/scripts/v.krige/v.krige.py	2010-12-01 10:12:07 UTC (rev 44503)
@@ -408,11 +408,14 @@
         if not haveRpy2:
             sys.exit(1)
         
-    # R packages check.
-    # @FIXME: it leaves a Rtmpxxxx folder into the make tempfolder and causes make complain. [markus]
+    # R packages check. Will create one error message after check of all packages.
+    missingPackagesList = []
     for each in ["gstat", "spgrass6", "maptools"]:
         if not robjects.r.require(each, quietly = True)[0]:
-            sys.exit(_("R package '%s' is missing. Install it and re-run v.krige.") % each)
+            missingPackagesList.append(each)
+    if missingPackagesList:
+        errorString = "R package(s) " + " ".join(["%s" % e for e in missingPackagesList] +  "missing. Install it/them and re-run v.krige.")
+        sys.exit(_(errorString))
     
 if __name__ == '__main__':
     if len(sys.argv) > 1: