1 |
diff -ruN e-smith-backup-2.4.0.old/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.4.0/root/etc/e-smith/events/actions/workstation-backup-dar |
diff -ruN e-smith-backup-2.4.0.p22/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.4.0/root/etc/e-smith/events/actions/workstation-backup-dar |
2 |
--- e-smith-backup-2.4.0.old/root/etc/e-smith/events/actions/workstation-backup-dar 2014-02-05 13:04:23.000000000 -0800 |
--- e-smith-backup-2.4.0.p22/root/etc/e-smith/events/actions/workstation-backup-dar 2014-02-05 16:38:55.000000000 -0800 |
3 |
+++ e-smith-backup-2.4.0/root/etc/e-smith/events/actions/workstation-backup-dar 2014-02-05 13:07:03.000000000 -0800 |
+++ e-smith-backup-2.4.0/root/etc/e-smith/events/actions/workstation-backup-dar 2014-02-05 16:40:07.000000000 -0800 |
4 |
|
@@ -85,7 +85,7 @@ |
5 |
|
my $tomail = $backupwk->prop('ToMail') || 'admin'; |
6 |
|
my $deleteearly = $backupwk->prop('DeleteEarly') || 'false'; |
7 |
|
my $ether = $internalinterface->prop('Name'); |
8 |
|
-my $tmpdir; |
9 |
|
+ |
10 |
|
|
11 |
|
$report .= "From: ".$frommail."\n"; |
12 |
|
$report .= "To: $tomail\n"; |
13 |
@@ -147,14 +147,6 @@ |
@@ -147,14 +147,6 @@ |
14 |
my $setdirname = $mntdir . "/$id/" . $setname; |
my $setdirname = $mntdir . "/$id/" . $setname; |
15 |
&createTree ($setdirname); |
&createTree ($setdirname); |
45 |
&createTree ($setdirname); |
&createTree ($setdirname); |
46 |
} |
} |
47 |
- foreach (bsd_glob("$tmpdir/$id/$bkname*")) |
- foreach (bsd_glob("$tmpdir/$id/$bkname*")) |
48 |
+ foreach (bsd_glob("$mntdir/$id/$bkname*")) # Move the backup files to the set directory |
+ foreach (bsd_glob("$mntdir/$id/*.dar")) # Move the backup files to the set directory |
49 |
{ |
{ |
50 |
ldie("Error while moving backup file $_ from temporary dir $tmpdir/$id to $setdirname : $!") |
- ldie("Error while moving backup file $_ from temporary dir $tmpdir/$id to $setdirname : $!") |
51 |
|
+ ldie("Error while moving backup file $_ to $setdirname : $!") |
52 |
unless move($_, $setdirname); |
unless move($_, $setdirname); |
53 |
} |
} |
54 |
- &removeTree ("$tmpdir/$id"); |
- &removeTree ("$tmpdir/$id"); |