[GRASS-SVN] r70502 - grass/trunk/lib/gis

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Feb 8 01:44:11 PST 2017


Author: martinl
Date: 2017-02-08 01:44:11 -0800 (Wed, 08 Feb 2017)
New Revision: 70502

Modified:
   grass/trunk/lib/gis/parser_dependencies.c
Log:
libgis: check_requires() - message cosmetics


Modified: grass/trunk/lib/gis/parser_dependencies.c
===================================================================
--- grass/trunk/lib/gis/parser_dependencies.c	2017-02-08 09:15:37 UTC (rev 70501)
+++ grass/trunk/lib/gis/parser_dependencies.c	2017-02-08 09:44:11 UTC (rev 70502)
@@ -266,9 +266,13 @@
 	return;
     if (count_present(rule, 1) < 1) {
 	char *err;
-	G_asprintf(&err, _("Option %s requires at least one of %s"),
-		   get_name(rule->opts[0]), describe_rule(rule, 1, 1));
-	append_error(err);
+        if (rule->count > 2)
+            G_asprintf(&err, _("Option <%s> requires at least one of %s"),
+                       get_name(rule->opts[0]), describe_rule(rule, 1, 1));
+        else
+            G_asprintf(&err, _("Option <%s> requires <%s>"),
+                       get_name(rule->opts[0]), describe_rule(rule, 1, 1));
+        append_error(err);
     }
 }
 



More information about the grass-commit mailing list