[GRASS-SVN] r69808 - grass/branches/releasebranch_7_0/vector/v.colors

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-11-13 14:37:58 -0800 (Sun, 13 Nov 2016)
New Revision: 69808

Modified:
   grass/branches/releasebranch_7_0/vector/v.colors/main.c
Log:
v.colors: throw fatal error if rules from stdin are specified, see #2555 (merge from trunk, r69806)

Modified: grass/branches/releasebranch_7_0/vector/v.colors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/main.c	2016-11-13 22:37:15 UTC (rev 69807)
+++ grass/branches/releasebranch_7_0/vector/v.colors/main.c	2016-11-13 22:37:58 UTC (rev 69808)
@@ -108,8 +108,7 @@
     opt.rules = G_define_standard_option(G_OPT_F_INPUT);
     opt.rules->key = "rules";
     opt.rules->required = NO;
-    opt.rules->label = _("Path to rules file");
-    opt.rules->description = _("\"-\" to read rules from stdin");
+    opt.rules->description = _("Path to rules file");
     opt.rules->guisection = _("Define");
 
     opt.rgbcol = G_define_standard_option(G_OPT_DB_COLUMN);
@@ -232,7 +231,7 @@
 
     is_from_stdin = rules && strcmp(rules, "-") == 0;
     if (is_from_stdin)
-        rules = NULL;
+        G_fatal_error(_("Reading rules from standard input is not implemented yet, please provide path to rules file instead."));
 
     mapset = G_find_vector(name, "");
     if (!mapset)