[GRASS-SVN] r33800 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-10-10 03:45:01 -0400 (Fri, 10 Oct 2008)
New Revision: 33800

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py
Log:
wxGUI: fix find colr2 element


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py	2008-10-10 03:55:10 UTC (rev 33799)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/colorrules.py	2008-10-10 07:45:01 UTC (rev 33800)
@@ -515,8 +515,9 @@
             
             # find existing color table and copy to temp file
             try:
-                old_colrtable = grass.find_file(name=self.inmap, element='colr2')['file']
-            except TypeError:
+                name, mapset = self.inmap.split('@')
+                old_colrtable = grass.find_file(name=name, element='colr2/' + mapset)['file']
+            except (TypeError, ValueError):
                 old_colrtable = None
             
             if old_colrtable: