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); -if ($deleteearly ne 'true') -{ - $tmpdir = $mntdir . '/tmp_dir'; - - &removeTree ("$tmpdir/$id"); - &createTree ("$tmpdir/$id"); - $report .= "Working directory //$smbhost/$smbshare/tmp_dir/$id\n"; -} $report .= "Destination //$smbhost/$smbshare/$id/$setname\n"; if ( $incnum == 0 ) @@ -222,7 +214,7 @@ &createTree ($setdirname); } -my $destination = ($deleteearly ne 'true') ? "$tmpdir/$id/$bkname" : "$setdirname/$bkname"; +my $destination = ($deleteearly ne 'true') ? "$mntdir/$id/$bkname" : "$setdirname/$bkname"; # Perform the actual backup my $rc = run_backup($destination); @@ -234,17 +226,16 @@ if ($deleteearly ne 'true') # Not DeleteEarly so move backup to $setdirname { - if ($incnum == 0) + if ($incnum == 0) # Create new set directory { &removeTree ($setdirname); &createTree ($setdirname); } - foreach (bsd_glob("$tmpdir/$id/$bkname*")) + 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 $_ to $setdirname : $!") unless move($_, $setdirname); } - &removeTree ("$tmpdir/$id"); } # update dar_manager catalog