[GRASS-SVN] r62969 - in grass/branches/releasebranch_7_0: . lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 01:29:31 -0800 (Wed, 26 Nov 2014)
New Revision: 62969

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
Log:
libgis: basename -> input/output
        (merge r62966-7)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,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,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,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,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62967

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-26 09:28:36 UTC (rev 62968)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-26 09:29:31 UTC (rev 62969)
@@ -325,18 +325,18 @@
                    _("Bicubic interpolation"));
         break;
     case G_OPT_R_BASENAME_INPUT:
-        Opt->key = "basename";
+        Opt->key = "input";
         Opt->type = TYPE_STRING;
-        Opt->key_desc = "input basename";
+        Opt->key_desc = "basename";
         Opt->required = YES;
         Opt->multiple = NO;
         Opt->gisprompt = "old,cell,raster";
         Opt->description = _("Name of input basename raster map(s)");
         break;
     case G_OPT_R_BASENAME_OUTPUT:
-        Opt->key = "basename";
+        Opt->key = "output";
         Opt->type = TYPE_STRING;
-        Opt->key_desc = "output basename";
+        Opt->key_desc = "basename";
         Opt->required = YES;
         Opt->multiple = NO;
         Opt->gisprompt = "new,cell,raster";