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

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

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


Revision 1.1 - (show annotations) (download)
Thu Dec 12 05:36:08 2013 UTC (10 years, 10 months ago) by wellsi
Branch: MAIN
CVS Tags: e-smith-backup-2_2_0-77_el5_sme, e-smith-backup-2_2_0-78_el5_sme, e-smith-backup-2_2_0-79_el5_sme, e-smith-backup-2_2_0-85_el5_sme, e-smith-backup-2_2_0-81_el5_sme, e-smith-backup-2_2_0-76_el5_sme, e-smith-backup-2_2_0-80_el5_sme, e-smith-backup-2_2_0-86_el5_sme, e-smith-backup-2_2_0-83_el5_sme, e-smith-backup-2_2_0-82_el5_sme, e-smith-backup-2_2_0-88_el5_sme, e-smith-backup-2_2_0-84_el5_sme, e-smith-backup-2_2_0-87_el5_sme, HEAD
Error occurred while calculating annotation data.
* Wed Dec 11 2013 Ian Wells <esmith@wellsi.com> 2.2.0-76.sme
- Workstation Backup, fix selective restore by requesting array
  of results from CGI.pm [SME: 7762]

1 diff -ruN e-smith-backup-2.2.0.old/root/etc/e-smith/web/functions/backup e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup
2 --- e-smith-backup-2.2.0.old/root/etc/e-smith/web/functions/backup 2013-12-11 20:44:17.000000000 -0800
3 +++ e-smith-backup-2.2.0/root/etc/e-smith/web/functions/backup 2013-12-11 21:27:35.000000000 -0800
4 @@ -2776,6 +2776,7 @@
5 my $regex = qr/\[.*\] */;
6 while (<RD>)
7 {
8 + $_ =~ s/[\r\n]+//g; # remove line endings
9 $_ =~ s/$regex//;
10 if ($filterexp) {next unless m/$rgfilter/};
11 push @flabels, $_;
12 @@ -2886,10 +2887,9 @@
13 return;
14 }
15
16 - my $restorefiles = $q->param ('restorefiles');
17 - $restorefiles =~ s/\r//;
18 + my @restorefiles = $q->param ('restorefiles');
19 my $f;
20 - foreach $f ($restorefiles)
21 + foreach $f (@restorefiles)
22 {
23 if ($f =~ /^(.*)$/)
24 {

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