--- rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-workstation-noTempDir.patch 2014/02/05 23:13:06 1.1 +++ rpms/e-smith-backup/sme9/e-smith-backup-2.4.0-workstation-noTempDir.patch 2014/02/08 22:53:55 1.2 @@ -1,6 +1,15 @@ -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 ---- 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/root/etc/e-smith/events/actions/workstation-backup-dar 2014-02-05 13:07:03.000000000 -0800 +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 +--- e-smith-backup-2.4.0.p22/root/etc/e-smith/events/actions/workstation-backup-dar 2014-02-05 16:38:55.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 +@@ -85,7 +85,7 @@ + my $tomail = $backupwk->prop('ToMail') || 'admin'; + my $deleteearly = $backupwk->prop('DeleteEarly') || 'false'; + my $ether = $internalinterface->prop('Name'); +-my $tmpdir; ++ + + $report .= "From: ".$frommail."\n"; + $report .= "To: $tomail\n"; @@ -147,14 +147,6 @@ my $setdirname = $mntdir . "/$id/" . $setname; &createTree ($setdirname); @@ -36,9 +45,10 @@ diff -ruN e-smith-backup-2.4.0.old/root/ &createTree ($setdirname); } - foreach (bsd_glob("$tmpdir/$id/$bkname*")) -+ 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 { - 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 : $!") ++ ldie("Error while moving backup file $_ to $setdirname : $!") unless move($_, $setdirname); } - &removeTree ("$tmpdir/$id");