[GRASS-SVN] r42400 -
grass/branches/releasebranch_6_4/general/g.message
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun May 30 19:23:01 EDT 2010
Author: hamish
Date: 2010-05-30 19:23:01 -0400 (Sun, 30 May 2010)
New Revision: 42400
Modified:
grass/branches/releasebranch_6_4/general/g.message/main.c
Log:
fix impt. msg flag desc. broken by r42147 (merge from trunk)
Modified: grass/branches/releasebranch_6_4/general/g.message/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.message/main.c 2010-05-30 23:22:10 UTC (rev 42399)
+++ grass/branches/releasebranch_6_4/general/g.message/main.c 2010-05-30 23:23:01 UTC (rev 42400)
@@ -59,7 +59,7 @@
important = G_define_flag();
important->key = 'i';
important->guisection = _("Level");
- important->description = _("Don't print message in quiet mode");
+ important->description = _("Print message in all but full quiet mode");
verbose = G_define_flag();
verbose->key = 'v';
@@ -92,12 +92,10 @@
debug_level = atoi(debug_opt->answer);
- if (fatal->answer) {
+ if (fatal->answer)
G_fatal_error(message->answer);
- }
- else if (warning->answer) {
+ else if (warning->answer)
G_warning(message->answer);
- }
else if (percent->answer) {
int i, n, s;
i = n = s = -1;
@@ -107,18 +105,14 @@
G_percent(i, n, s);
fprintf(stderr, "\n");
}
- else if (debug_flag->answer) {
+ else if (debug_flag->answer)
G_debug(debug_level, message->answer);
- }
- else if (verbose->answer) {
- G_verbose_message(message->answer);
- }
- else if (important->answer) {
+ else if (important->answer)
G_important_message(message->answer);
- }
- else {
+ else if (verbose->answer)
+ G_verbose_message(message->answer);
+ else
G_message(message->answer);
- }
exit(EXIT_SUCCESS);
}
More information about the grass-commit
mailing list