[GRASS-SVN] r45512 - grass/branches/releasebranch_6_4/gui/tcltk/gis.m

[svn_grass at osgeo.org]

Author: marisn
Date: 2011-03-01 10:08:14 -0800 (Tue, 01 Mar 2011)
New Revision: 45512

Modified:
   grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gm.tcl
Log:
gis.m Lack of LOCATION or MAPSET is fatal. (merge r45511 from devel6)

Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gm.tcl
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gm.tcl	2011-03-01 18:03:54 UTC (rev 45511)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gm.tcl	2011-03-01 18:08:14 UTC (rev 45512)
@@ -70,6 +70,12 @@
 	exit 1
 }
 
+# if any of those is empty, there's no reason to continue. it's a failure.
+if { $gisdbase=={} || $location_name=={} || $mapset=={} } {
+	GmLib::errmsg [G_msg "GISDBASE or LOCATION_NAME or MAPSET is empty. \
+	This is a fatal error. gis.m can not work without proper settings."]
+	exit 1
+}
 
 # path to icons for GIS Manager
 set iconpath [file join "$env(GISBASE)" "etc" "gui" "icons" "grass"]


Property changes on: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gm.tcl
___________________________________________________________________
Added: svn:mergeinfo
   + /grass/branches/develbranch_6/gui/tcltk/gis.m/gm.tcl:44934,45511
/grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gm.tcl:44816
/grass/trunk/gui/tcltk/gis.m/gm.tcl:44830,44833,44896,44948,44951