packages: bacula-backup-mysql/bacula-backup-mysql - cleanup tmp dir when ba...

[glen]

Author: glen                         Date: Wed Dec 15 13:15:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanup tmp dir when backup failed

---- Files affected:
packages/bacula-backup-mysql:
   bacula-backup-mysql (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/bacula-backup-mysql/bacula-backup-mysql
diff -u packages/bacula-backup-mysql/bacula-backup-mysql:1.8 packages/bacula-backup-mysql/bacula-backup-mysql:1.9
--- packages/bacula-backup-mysql/bacula-backup-mysql:1.8	Wed Dec 15 11:25:06 2010
+++ packages/bacula-backup-mysql/bacula-backup-mysql	Wed Dec 15 14:15:04 2010
@@ -88,6 +88,7 @@
 	# put it to "production dir"
 	my $cluster_dir = "$backup_dir/$cluster";
 	if (!-d $cluster_dir && !mkdir($cluster_dir) && !-d $cluster_dir) {
+		rmtree($dstdir);
 		die "cluster dir '$cluster_dir' not present and can't be created\n";
 	}
 
@@ -96,8 +97,11 @@
 		rmtree($dirname);
 	}
 
-	my $srcdir= "$dstdir/$database";
-	rename($srcdir, $dirname) or die "Rename '$srcdir'->'$dirname' failed: $!\n";
+	my $srcdir = "$dstdir/$database";
+	unless (rename($srcdir, $dirname)) {
+		rmtree($dstdir);
+		die "Rename '$srcdir'->'$dirname' failed: $!\n";
+	}
 
 	rmdir($dstdir) or warn $!;
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula-backup-mysql/bacula-backup-mysql?r1=1.8&r2=1.9&f=u