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

Jaka Kranjc scm at sourcemage.org
Tue Jun 17 17:56:00 EDT 2008


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

 ChangeLog                         |    4 ++++
 usr/sbin/cleanse                  |    2 +-
 var/lib/sorcery/modules/libtablet |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

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

    cleanse: call tablet_coalesce_files with $BACKUPDIR, so the log isn't
          discarded right away

commit b546475f32e36500d321652d1ac4fcea6db2b4ba
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    libtablet: increment the counter before drawing the progress bar - this way it will
    reach 100%

diff --git a/ChangeLog b/ChangeLog
index d784441..f30de12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 	* sorcery_config.5: clarify what the internal_version is for
 	* libtablet: sped up tablet_coalesce_files to take a third of the time
 	  append to the link_log, don't overwrite it each time
+	  increment the counter before drawing the progress bar - this way it will
+	  reach 100%
+	* cleanse: call tablet_coalesce_files with $BACKUPDIR, so the log isn't
+	  discarded right away
 
 2008-06-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* libstate: change modify_config to store values into variables in a manner
diff --git a/usr/sbin/cleanse b/usr/sbin/cleanse
index ee9b9a7..893826e 100755
--- a/usr/sbin/cleanse
+++ b/usr/sbin/cleanse
@@ -150,7 +150,7 @@ function args()
         tablet_cleanse_tablet $TABLET_PATH $BACKUPDIR
         let rc+=$?
         if [[ $1 == coalesce ]] ; then
-          tablet_coalesce_files $TABLET_PATH
+          tablet_coalesce_files $TABLET_PATH $BACKUPDIR
           let rc+=$?
           shift
         fi
diff --git a/var/lib/sorcery/modules/libtablet b/var/lib/sorcery/modules/libtablet
index 276bf35..7fd438b 100755
--- a/var/lib/sorcery/modules/libtablet
+++ b/var/lib/sorcery/modules/libtablet
@@ -927,8 +927,8 @@ function tablet_coalesce_files() {
   find $dir -type f -exec md5sum {} + 2>/dev/null |
   while read line; do
     hash_append tablet_coalesce $line
-    progress_bar $i $total_files
     let i+=1
+    progress_bar $i $total_files
   done
   message ""
 



More information about the SM-Commit mailing list