[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (8936e0cba33dff48fd345baada2ade852874de40)

Jaka Kranjc scm at sourcemage.org
Wed Jan 30 08:47:43 EST 2008


GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog         |    1 +
 usr/sbin/confmeld |    7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 8936e0cba33dff48fd345baada2ade852874de40
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    confmeld: improved the output (more spacing and better messages)

diff --git a/ChangeLog b/ChangeLog
index 05164a7..9a29e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2008-01-30 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* common, libtrack: preserve the old behaviour and include all logs in the
 	  md5 log (flak from #13835)
+	* confmeld: improved the output (more spacing and better messages)
 
 2008-01-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* local/README: fixed typo
diff --git a/usr/sbin/confmeld b/usr/sbin/confmeld
index 1a8a746..f0a9b88 100755
--- a/usr/sbin/confmeld
+++ b/usr/sbin/confmeld
@@ -132,16 +132,17 @@ function main()
       #
       if [[ $last_sdate && $last_sdate != $sdate ]]
       then
-        message "${MESSAGE_COLOR}Removing dirs and files in config stage area.${DEFAULT_COLOR}"
+        message "${MESSAGE_COLOR}Removing stale dirs and files in the config stage area.${DEFAULT_COLOR}"
         rm_source_dir $CONFIG_STAGE_DIRECTORY/$last_spell/$last_sdate
       fi
       if [[ $last_spell && $last_spell != $spell ]]
       then
-        message "${MESSAGE_COLOR}Removing dirs and files in config stage area.${DEFAULT_COLOR}"
+        message "${MESSAGE_COLOR}Removing stale dirs and files in the config stage area.${DEFAULT_COLOR}"
         rm_source_dir $CONFIG_STAGE_DIRECTORY/$last_spell
       fi
       last_sdate="$sdate"
       last_spell="$spell"
+      echo -e "\n"
     fi
   done
   #
@@ -150,7 +151,7 @@ function main()
   #
   if [[ $last_spell ]]
   then
-    message "\n${MESSAGE_COLOR}Removing dirs and files in config stage area.${DEFAULT_COLOR}"
+    message "${MESSAGE_COLOR}Removing any remaining stale dirs and files in the config stage area.${DEFAULT_COLOR}"
     rm_source_dir $CONFIG_STAGE_DIRECTORY/$last_spell
   fi
   find $CONFIG_STAGE_DIRECTORY -mindepth 1 -maxdepth 2 -type d -empty -delete



More information about the SM-Commit mailing list