From d3f1209a76a69f642ffbfe2fb796ebdf650753e7 Mon Sep 17 00:00:00 2001
From: dpavlin <dpavlin@8392b6e1-25fa-0310-8288-cc32f8e212ea>
Date: Sun, 29 Jan 2006 15:54:10 +0000
Subject: [PATCH] mark failed backups deleted (should they actually be deleted
 from backups table?)

git-svn-id: svn+ssh://llin/home/dpavlin/private/svn/BackupPC/trunk@312 8392b6e1-25fa-0310-8288-cc32f8e212ea
---
 bin/BackupPC_incPartsUpdate | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/bin/BackupPC_incPartsUpdate b/bin/BackupPC_incPartsUpdate
index a6093f1..72a5ba0 100755
--- a/bin/BackupPC_incPartsUpdate
+++ b/bin/BackupPC_incPartsUpdate
@@ -142,6 +142,15 @@ sub get_backup_id($$$) {
 	return $id;
 }
 
+sub backup_inc_deleted($) {
+	my $backup_id = shift;
+	my $sth_inc_deleted = $dbh->prepare(qq{
+		update backups set
+			inc_deleted = true
+		where id = ?
+	});
+	$sth_inc_deleted->execute($backup_id);
+}
 
 sub tar_check($$$$) {
 	my ($host,$share,$num,$filename) = @_;
@@ -274,13 +283,7 @@ sub tar_check($$$$) {
 			print ", EMPTY tar\n";
 
 			my $backup_id = get_backup_id($host, $share, $num);
-
-			my $sth_inc_deleted = $dbh->prepare(qq{
-				update backups set
-					inc_deleted = true
-				where id = ?
-			});
-			$sth_inc_deleted->execute($backup_id);
+			backup_inc_deleted( $backup_id );
 
 			$dbh->commit;
 
@@ -431,11 +434,12 @@ while (my $row = $sth->fetchrow_hashref) {
 	my $t = time();
 
 	# re-create archive?
-	my $cmd = qq{ $tarIncCreate -h "$row->{'host'}" -s "$row->{'share'}" -n $row->{'num'} -f };
+	my $cmd = qq[ $tarIncCreate -h "$row->{host}" -s "$row->{share}" -n $row->{num} -f ];
 	print STDERR "## $cmd\n" if ($debug);
 
 	if (system($cmd) != 0) {
-		print STDERR " FAILED";
+		print STDERR " FAILED, marking this backup deleted";
+		backup_inc_deleted( $row->{backup_id} );
 	}
 
 	print ", dur: ",fmt_time(time() - $t), "\n";
-- 
2.20.1