[GRASS-SVN] r63916 - in grass/branches/releasebranch_7_0: . general/g.gisenv gui/wxpython/mapdisp
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jan 1 12:17:59 PST 2015
Author: martinl
Date: 2015-01-01 12:17:59 -0800 (Thu, 01 Jan 2015)
New Revision: 63916
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.gisenv/main.c
grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py
Log:
g.gisenv: change unset option to be multiple
wxGUI: reflect r63745 in standalone monitors
(merge 63745-6 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744-63749,63751-63752,63756,63758,63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914
Modified: grass/branches/releasebranch_7_0/general/g.gisenv/main.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.gisenv/main.c 2015-01-01 20:05:23 UTC (rev 63915)
+++ grass/branches/releasebranch_7_0/general/g.gisenv/main.c 2015-01-01 20:17:59 UTC (rev 63916)
@@ -9,7 +9,7 @@
* Markus Neteler <neteler itc.it>
* Martin Landa <landa.martin gmail.com>
* PURPOSE:
- * COPYRIGHT: (C) 2003-2006, 2011-2013 by the GRASS Development Team
+ * COPYRIGHT: (C) 2003-2014 by the GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -72,7 +72,8 @@
unset_opt->key_desc = "variable";
unset_opt->required = NO;
unset_opt->guisection = _("Set");
-
+ unset_opt->multiple = YES;
+
store_opt = G_define_option();
store_opt->key = "store";
store_opt->type = TYPE_STRING;
@@ -161,13 +162,17 @@
}
if (unset_opt->answer) {
- u_name = parse_variable(unset_opt->answer, &value);
- if (value)
- G_warning(_("Value '%s' ignored when unsetting the GRASS variable"),
- value);
+ n = 0;
+ while (unset_opt->answers[n]) {
+ u_name = parse_variable(unset_opt->answers[n], &value);
+ if (value)
+ G_warning(_("Value '%s' ignored when unsetting the GRASS variable"),
+ value);
- G_getenv2(u_name, store); /* G_fatal_error() if not defined */
- G_unsetenv2(u_name, store);
+ G_getenv2(u_name, store); /* G_fatal_error() if not defined */
+ G_unsetenv2(u_name, store);
+ n++;
+ }
}
if (u_name)
Modified: grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py 2015-01-01 20:05:23 UTC (rev 63915)
+++ grass/branches/releasebranch_7_0/gui/wxpython/mapdisp/main.py 2015-01-01 20:17:59 UTC (rev 63916)
@@ -461,12 +461,13 @@
# clean up GRASS env variables
env = grass.gisenv()
env_name = 'MONITOR_%s' % monName.upper()
+ unset = list()
for key in env.keys():
- if key.find(env_name) == 0:
- RunCommand('g.gisenv',
- unset = '%s' % key)
- if key == 'MONITOR' and env[key] == monName:
- RunCommand('g.gisenv',
- unset = '%s' % key)
+ if key.find(env_name) == 0 or \
+ (key == 'MONITOR' and env[key] == monName):
+ unset.append(key)
+ if unset:
+ RunCommand('g.gisenv',
+ unset = '%s' % ','.join(unset))
sys.exit(0)
More information about the grass-commit
mailing list