Selaa lähdekoodia

g.mapsets: simplify g.mapsets_picker.py

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42625 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 vuotta sitten
vanhempi
commit
34e6a25110
2 muutettua tiedostoa jossa 6 lisäystä ja 5 poistoa
  1. 6 4
      general/g.mapsets/g.mapsets_picker.py
  2. 0 1
      general/g.mapsets/main.c

+ 6 - 4
general/g.mapsets/g.mapsets_picker.py

@@ -104,19 +104,21 @@ class CheckListMapset(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Check
         self.curr_mapset = gisenv['MAPSET']
         
         ret = grass.read_command('g.mapsets',
+                                 quiet = True,
                                  flags = 'l',
-                                 fs = '|')
+                                 fs = 'newline')
         self.mapsets = []
         if ret:
-            self.mapsets = ret.rstrip('\n').split('|')
+            self.mapsets = ret.splitlines()
             
 
         ret = grass.read_command('g.mapsets',
+                                 quiet = True,
                                  flags = 'p',
-                                 fs = '|')
+                                 fs = 'newline')
         mapsets_access = []
         if ret:
-            mapsets_access = ret.rstrip('\n').split('|')
+            mapsets_access = ret.splitlines()
             
         for mapset in self.mapsets:
             index = self.InsertStringItem(sys.maxint, mapset)

+ 0 - 1
general/g.mapsets/main.c

@@ -114,7 +114,6 @@ int main(int argc, char *argv[])
     }
 
     if (opt.dialog->answer) {
-	putenv("GRASS_VERBOSE=0");
 	sprintf(path, "%s/etc/gui/scripts/g.mapsets_picker.py", G_gisbase());
 	G_spawn(getenv("GRASS_PYTHON"), "g.mapsets_picker.py", path, NULL);
     }