X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC;h=79d89c74556c2f4b7a182962e6d1e1c1f1896ad4;hp=f3df54a00c99cb471aa7132ad880537641765c4a;hb=2441b9094f3f6e4f2a3a4fe67781780e6f6890bd;hpb=f076585d3ff9dfe6de32292b897e293008efe74e

diff --git a/bin/BackupPC b/bin/BackupPC
index f3df54a..79d89c7 100755
--- a/bin/BackupPC
+++ b/bin/BackupPC
@@ -47,7 +47,7 @@
 #
 #========================================================================
 #
-# Version 3.2.0, released 31 Dec 2008.
+# Version 3.2.0beta0, released 17 Jan 2009.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -409,7 +409,6 @@ sub Main_TryToRun_nightly
 	$CmdQueueOn{$bpc->trashJob} = 1;
     }
     if ( $RunNightlyWhenIdle == 1 ) {
-
         #
         # Queue multiple nightly jobs based on the configuration
         #
@@ -477,7 +476,6 @@ sub Main_TryToRun_nightly
             $start = $start0 + int(($end - $start0)
 				  * ($i + 1) / $Conf{MaxBackupPCNightlyJobs});
             push(@$cmd, $start - 1);
-
             my $job = $bpc->adminJob($i);
             unshift(@CmdQueue, {
                     host    => $job,
@@ -868,7 +866,12 @@ sub Main_Check_Timeout
         # Remember to run the nightly script when the next CmdQueue
         # job is done.
         #
-        $RunNightlyWhenIdle = 1;
+        if ( $RunNightlyWhenIdle == 2 ) {
+            print(LOG $bpc->timeStamp, "BackupPC_nightly is still running after 24 hours!!"
+                                     . "  You should adjust the config settings; Skipping this run\n");
+        } else {
+            $RunNightlyWhenIdle = 1;
+        }
     }
     #
     # Write out the current status and then queue all the PCs
@@ -958,6 +961,8 @@ sub Main_Check_Job_Messages
                                 if ( $Status{$host}{dhcpCheckCnt} > 0 );
             } elsif ( $mesg =~ /^xferPids (.*)/ ) {
                 $Jobs{$host}{xferPid} = $1;
+            } elsif ( $mesg =~ /^completionPercent (.*)/ ) {
+                $Jobs{$host}{completionPercent} = $1;
             } elsif ( $mesg =~ /^started_restore/ ) {
                 $Jobs{$host}{type}    = "restore";
                 print(LOG $bpc->timeStamp,