/[smeserver]/rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-fixReport.patch
ViewVC logotype

Contents of /rpms/e-smith-backup/sme8/e-smith-backup-2.2.0-fixReport.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Sun May 17 07:49:04 2009 UTC (15 years ago) by snetram
Branch: MAIN
CVS Tags: e-smith-backup-2_2_0-62_el5_sme, e-smith-backup-2_2_0-30_el5_sme, e-smith-backup-2_2_0-72_el5_sme, e-smith-backup-2_2_0-40_el5_sme, e-smith-backup-2_2_0-27_el5_sme, e-smith-backup-2_2_0-60_el5_sme, e-smith-backup-2_2_0-26_el5_sme, e-smith-backup-2_2_0-25_el5_sme, e-smith-backup-2_2_0-20_el5_sme, e-smith-backup-2_2_0-21_el5_sme, e-smith-backup-2_2_0-66_el5_sme, e-smith-backup-2_2_0-65_el5_sme, e-smith-backup-2_2_0-80_el5_sme, e-smith-backup-2_2_0-44_el5_sme, e-smith-backup-2_2_0-83_el5_sme, e-smith-backup-2_2_0-41_el5_sme, e-smith-backup-2_2_0-52_el5_sme, e-smith-backup-2_2_0-82_el5_sme, e-smith-backup-2_2_0-38_el5_sme, e-smith-backup-2_2_0-88_el5_sme, e-smith-backup-2_2_0-74_el5_sme, e-smith-backup-2_2_0-55_el5_sme, e-smith-backup-2_2_0-24_el5_sme, e-smith-backup-2_2_0-84_el5_sme, e-smith-backup-2_2_0-63_el5_sme, e-smith-backup-2_2_0-87_el5_sme, e-smith-backup-2_2_0-64_el5_sme, e-smith-backup-2_2_0-43_el5_sme, e-smith-backup-2_2_0-48_el5_sme, e-smith-backup-2_2_0-36_el5_sme, e-smith-backup-2_2_0-81_el5_sme, e-smith-backup-2_2_0-68_el5_sme, e-smith-backup-2_2_0-35_el5_sme, e-smith-backup-2_2_0-86_el5_sme, e-smith-backup-2_2_0-22_el5_sme, e-smith-backup-2_2_0-34_el5_sme, e-smith-backup-2_2_0-50_el5_sme, e-smith-backup-2_2_0-19_el5_sme, e-smith-backup-2_2_0-51_el5_sme, e-smith-backup-2_2_0-71_el5_sme, e-smith-backup-2_2_0-23_el5_sme, e-smith-backup-2_2_0-61_el5_sme, e-smith-backup-2_2_0-57_el5_sme, e-smith-backup-2_2_0-78_el5_sme, e-smith-backup-2_2_0-73_el5_sme, e-smith-backup-2_2_0-79_el5_sme, e-smith-backup-2_2_0-39_el5_sme, e-smith-backup-2_2_0-33_el5_sme, e-smith-backup-2_2_0-75_el5_sme, e-smith-backup-2_2_0-28_el5_sme, e-smith-backup-2_2_0-76_el5_sme, e-smith-backup-2_2_0-56_el5_sme, e-smith-backup-2_2_0-58_el5_sme, e-smith-backup-2_2_0-45_el5_sme, e-smith-backup-2_2_0-59_el5_sme, e-smith-backup-2_2_0-32_el5_sme, e-smith-backup-2_2_0-53_el5_sme, e-smith-backup-2_2_0-67_el5_sme, e-smith-backup-2_2_0-42_el5_sme, e-smith-backup-2_2_0-29_el5_sme, e-smith-backup-2_2_0-70_el5_sme, e-smith-backup-2_2_0-77_el5_sme, e-smith-backup-2_2_0-54_el5_sme, e-smith-backup-2_2_0-85_el5_sme, e-smith-backup-2_2_0-69_el5_sme, e-smith-backup-2_2_0-37_el5_sme, e-smith-backup-2_2_0-31_el5_sme, e-smith-backup-2_2_0-49_el5_sme, e-smith-backup-2_2_0-47_el5_sme, e-smith-backup-2_2_0-46_el5_sme, HEAD
* Sun May 17 2009 Jonathan Martens <smeserver-contribs@snetram.nl>
- Fix DAR e-mail message with regards to incremental backups [SME: 4579]

1 diff -ruN e-smith-backup-2.0.0.old/root/etc/e-smith/events/actions/workstation-backup-dar e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar
2 --- e-smith-backup-2.0.0.old/root/etc/e-smith/events/actions/workstation-backup-dar 2009-05-16 23:00:49.000000000 +0100
3 +++ e-smith-backup-2.0.0/root/etc/e-smith/events/actions/workstation-backup-dar 2009-05-16 14:23:07.000000000 +0100
4 @@ -78,7 +78,7 @@
5 $report .= "DAILY BACKUP TO WORKSTATION REPORT \n";
6 $report .= "================================== \n";
7 $report .= "Backup started at " .$tim . "\n";
8 -$report .= "Backup of mysql databases has been done.\n";
9 +$report .= "Backup of mysql databases has been done\n";
10
11 # mounting backup directory
12
13 @@ -177,10 +177,14 @@
14 }
15
16 $report .= "Using set number $setnum of $setsmax\n";
17 -$report .= "Attempt to " .
18 - ($incnum == 0) ?
19 - "full backup \n" :
20 - "incremental backup number $incnum of $daysinset\n";
21 +if ($incnum == 0)
22 +{
23 + $report .= "Attempt full backup \n";
24 +}
25 +else
26 +{
27 + $report .= "Attempt incremental backup number $incnum of $daysinset\n";
28 +}
29
30 # if no set directory, make it
31 my $setname = "set" . $setnum;
32 @@ -235,7 +239,7 @@
33 }
34
35 $report .= "Backup base file name is $bkname \n";
36 -$report .= "Making backup on temporary dir... \n";
37 +$report .= "Making backup in temp directory\n";
38
39 # calculate real timeout if we timeout incrementals only.
40 # timeout of 88500 is a security for aborting backup within 24h
41 @@ -244,7 +248,7 @@
42 {
43 $timeout = 88500;
44 }
45 -$report .= "using a backup session timeout of : $timeout seconds\n";
46 +$report .= "Using a backup session timeout of : $timeout seconds\n";
47
48 # expanding backup configuration file template
49

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed