[GRASS-SVN] r60151 - grass-addons/grass6/raster/r.connectivity.network

svn_grass at osgeo.org svn_grass at osgeo.org
Wed May 7 15:16:53 PDT 2014


Author: sbl
Date: 2014-05-07 15:16:53 -0700 (Wed, 07 May 2014)
New Revision: 60151

Modified:
   grass-addons/grass6/raster/r.connectivity.network/r.connectivity.network
Log:
Fixs of igraph library version naming (r.connectivity.network)

Modified: grass-addons/grass6/raster/r.connectivity.network/r.connectivity.network
===================================================================
--- grass-addons/grass6/raster/r.connectivity.network/r.connectivity.network	2014-05-07 19:29:38 UTC (rev 60150)
+++ grass-addons/grass6/raster/r.connectivity.network/r.connectivity.network	2014-05-07 22:16:53 UTC (rev 60151)
@@ -375,7 +375,7 @@
 
 #Check igraph version
 igraph_version=$(echo \
-'if(as.integer(as.double(sub("-", "", packageDescription("igraph", fields = c("Version"))))*100)<62) cat(packageDescription("igraph", fields = c("Version")))' | R --no-save --no-restore --slave)
+'if(as.double(substr(packageDescription("igraph", fields = c("Version")),1,3))<=0.6) cat(packageDescription("igraph", fields = c("Version")))' | R --no-save --no-restore --slave)
 if [ -n "$igraph_version" ] ; then
 	g.message -e "The required igraph version is 0.6-2 or later, the installed version is ${igraph_version}.
 	Please download and install at least igraph version 0.6-2"



More information about the grass-commit mailing list