[GRASS-SVN] r44014 - grass/branches/releasebranch_6_4/general/g.mapset

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-10-24 01:21:28 -0700 (Sun, 24 Oct 2010)
New Revision: 44014

Modified:
   grass/branches/releasebranch_6_4/general/g.mapset/main.c
Log:
g.mapset: be less verbose when quiet flag is used
(merge r44012 from trunk)


Modified: grass/branches/releasebranch_6_4/general/g.mapset/main.c
===================================================================
--- grass/branches/releasebranch_6_4/general/g.mapset/main.c	2010-10-24 08:21:00 UTC (rev 44013)
+++ grass/branches/releasebranch_6_4/general/g.mapset/main.c	2010-10-24 08:21:28 UTC (rev 44014)
@@ -46,8 +46,8 @@
 
     module = G_define_module();
     module->keywords = _("general, settings");
-    module->label = _("Change current mapset.");
-    module->description = _("Optionally create new mapset or list available mapsets.");
+    module->label = _("Changes current mapset.");
+    module->description = _("Optionally create new mapset or list available mapsets in given location.");
     
     mapset_opt = G_define_option();
     mapset_opt->key = "mapset";
@@ -196,7 +196,7 @@
 
     /* Clean temporary directory */
     sprintf(path, "%s/etc/clean_temp", G_gisbase());
-    G_message(_("Cleaning up temporary files..."));
+    G_verbose_message(_("Cleaning up temporary files..."));
     G_spawn(path, "clean_temp", NULL);
 
     /* Reset variables */
@@ -210,20 +210,23 @@
 
     G_free(mapset_old_path);
 
-    G_warning(_("Your shell continues to use the history for the old mapset"));
+    G_important_message(_("Your shell continues to use the history for the old mapset"));
 
     if ((shell = getenv("SHELL"))) {
 	if (strstr(shell, "bash")) {
-	    G_message(_("You can switch the history by commands:\n"
-			"history -w; history -r %s/.bash_history; HISTFILE=%s/.bash_history"),
-		      mapset_new_path, mapset_new_path);
+	    G_important_message(_("You can switch the history by commands:\n"
+				  "history -w; history -r %s/.bash_history; HISTFILE=%s/.bash_history"),
+				mapset_new_path, mapset_new_path);
 	}
 	else if (strstr(shell, "tcsh")) {
-	    G_message(_("You can switch the history by commands:\n"
-			"history -S; history -L %s/.history; setenv histfile=%s/.history"),
-		      mapset_new_path, mapset_new_path);
+	    G_important_message(_("You can switch the history by commands:\n"
+				  "history -S; history -L %s/.history; setenv histfile=%s/.history"),
+				mapset_new_path, mapset_new_path);
 	}
     }
+
+    G_message(_("Your current mapset is <%s>"), mapset_new);
+    
     G_free(mapset_new_path);
 
     return (EXIT_SUCCESS);