[GRASS-SVN] r46644 - grass/branches/develbranch_6/scripts/v.krige

[svn_grass at osgeo.org]

Author: aghisla
Date: 2011-06-09 06:45:44 -0700 (Thu, 09 Jun 2011)
New Revision: 46644

Modified:
   grass/branches/develbranch_6/scripts/v.krige/v.krige.py
Log:
Added rgeos compatibility (merge from trunk).

Modified: grass/branches/develbranch_6/scripts/v.krige/v.krige.py
===================================================================
--- grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2011-06-09 13:35:08 UTC (rev 46643)
+++ grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2011-06-09 13:45:44 UTC (rev 46644)
@@ -346,6 +346,7 @@
 
         importR()        
         if options['model'] is '':
+            #@FIXME does not catch error.
             try:
                 robjects.r.require("automap")
             except ImportError, e:
@@ -407,7 +408,7 @@
         
     # R packages check. Will create one error message after check of all packages.
     missingPackagesList = []
-    for each in ["gstat", "spgrass6", "maptools"]:
+    for each in ["rgeos", "gstat", "spgrass6", "maptools"]:
         if not robjects.r.require(each, quietly = True)[0]:
             missingPackagesList.append(each)
     if missingPackagesList: