[GRASS-SVN] r62411 - grass/branches/releasebranch_7_0/lib/gis

[svn_grass at osgeo.org]

Author: hcho
Date: 2014-10-26 20:51:38 -0700 (Sun, 26 Oct 2014)
New Revision: 62411

Modified:
   grass/branches/releasebranch_7_0/lib/gis/parser.c
   grass/branches/releasebranch_7_0/lib/gis/parser_local_proto.h
Log:
libgis: Backport r61351

Modified: grass/branches/releasebranch_7_0/lib/gis/parser.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser.c	2014-10-27 03:43:09 UTC (rev 62410)
+++ grass/branches/releasebranch_7_0/lib/gis/parser.c	2014-10-27 03:51:38 UTC (rev 62411)
@@ -419,7 +419,8 @@
 
     /* If there are NO arguments, go interactive */
 
-    if (argc < 2 && st->has_required && !st->no_interactive && isatty(0)) {
+    if (argc < 2 && (st->has_required || G__has_required_rule())
+	&& !st->no_interactive && isatty(0)) {
 	module_gui_wx();
 	return -1;
     }

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_local_proto.h
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_local_proto.h	2014-10-27 03:43:09 UTC (rev 62410)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_local_proto.h	2014-10-27 03:51:38 UTC (rev 62411)
@@ -54,5 +54,9 @@
 int  G__uses_new_gisprompt(void);
 void G__print_keywords(FILE *, void (*)(FILE *, const char *));
 
+void G__check_option_rules(void);
+void G__describe_option_rules(void);
+int G__has_required_rule(void);
+
 #endif