[GRASS-SVN] r44012 - grass/trunk/general/g.mapset

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-10-24 01:19:40 -0700 (Sun, 24 Oct 2010)
New Revision: 44012

Modified:
   grass/trunk/general/g.mapset/main.c
Log:
g.mapset: be less verbose when quiet flag is used


Modified: grass/trunk/general/g.mapset/main.c
===================================================================
--- grass/trunk/general/g.mapset/main.c	2010-10-24 08:04:44 UTC (rev 44011)
+++ grass/trunk/general/g.mapset/main.c	2010-10-24 08:19:40 UTC (rev 44012)
@@ -44,8 +44,8 @@
     module = G_define_module();
     G_add_keyword(_("general"));
     G_add_keyword(_("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";
@@ -178,7 +178,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 */
@@ -192,20 +192,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);