Minor changes to lib/BackupPC/Xfer/RsyncDigest.pm and bin/BackupPC_nightly

[BackupPC.git] / bin / BackupPC_nightly

diff --git a/bin/BackupPC_nightly b/bin/BackupPC_nightly
index 2639b41..ff26182 100755 (executable)
--- a/bin/BackupPC_nightly
+++ b/bin/BackupPC_nightly
@@ -55,7 +55,7 @@
 #
 #========================================================================
 #
-# Version 3.0.0beta1, released 30 Jul 2006.
+# Version 3.0.0beta3, released 3 Dec 2006.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -170,6 +170,15 @@ for my $pool ( qw(pool cpool) ) {
        $dirCnt++ if ( ($i % 16) == 0
                       && -d "$TopDir/$pool/$hexChars[int($i / 16)]" );
 
+        #
+        # We need to process all pending deletes before we do the
+        # renames
+        #
+        if ( @PendingDelete ) {
+            sleep(1);
+            processPendingDeletes(1);
+        }
+
         #
         # Now make sure that files with repeated checksums are still
         # sequentially numbered
@@ -203,7 +212,7 @@ for my $pool ( qw(pool cpool) ) {
     }
 }
 
-sleep(10);
+sleep(1);
 processPendingDeletes(1);
 
 ###########################################################################