projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3.1.0 changes:
[BackupPC.git]
/
lib
/
BackupPC
/
CGI
/
EditConfig.pm
diff --git
a/lib/BackupPC/CGI/EditConfig.pm
b/lib/BackupPC/CGI/EditConfig.pm
index
aa48bf9
..
edc4526
100644
(file)
--- a/
lib/BackupPC/CGI/EditConfig.pm
+++ b/
lib/BackupPC/CGI/EditConfig.pm
@@
-28,7
+28,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 3.1.0
beta0, released 3 Sep
2007.
+# Version 3.1.0
, released 25 Nov
2007.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-379,13
+379,17
@@
sub action
}
if ( (my $var = $In{overrideUncheck}) ne "" ) {
#
}
if ( (my $var = $In{overrideUncheck}) ne "" ) {
#
- # a compound variable was unchecked; delete
extra
- # variables to make the shape the same.
+ # a compound variable was unchecked; delete
or
+ #
add extra
variables to make the shape the same.
#
#print STDERR Dumper(\%In);
foreach my $v ( keys(%In) ) {
#
#print STDERR Dumper(\%In);
foreach my $v ( keys(%In) ) {
- next if ( $v !~ /^v_zZ_(\Q$var\E(_zZ_.*|$))/ );
- delete($In{$v}) if ( !defined($In{"orig_zZ_$1"}) );
+ if ( $v =~ /^v_zZ_(\Q$var\E(_zZ_.*|$))/ ) {
+ delete($In{$v}) if ( !defined($In{"orig_zZ_$1"}) );
+ }
+ if ( $v =~ /^orig_zZ_(\Q$var\E(_zZ_.*|$))/ ) {
+ $In{"v_zZ_$1"} = $In{$v};
+ }
}
delete($In{"vflds.$var"});
}
}
delete($In{"vflds.$var"});
}
@@
-725,9
+729,14
@@
EOF
($mesg, my $hostChange) = hostsDiffMesg($hostsNew);
$bpc->HostInfoWrite($hostsNew) if ( $hostChange );
foreach my $host ( keys(%$copyConf) ) {
($mesg, my $hostChange) = hostsDiffMesg($hostsNew);
$bpc->HostInfoWrite($hostsNew) if ( $hostChange );
foreach my $host ( keys(%$copyConf) ) {
- my $confData = $bpc->ConfigDataRead($copyConf->{$host});
+ #
+ # Currently host names are forced to lc when they
+ # are read from the hosts file. Therefore we need
+ # to force the from and to hosts to lc.
+ #
+ my $confData = $bpc->ConfigDataRead(lc($copyConf->{$host}));
my $fromHost = $copyConf->{$host};
my $fromHost = $copyConf->{$host};
- $err .= $bpc->ConfigDataWrite(
$host
, $confData);
+ $err .= $bpc->ConfigDataWrite(
lc($host)
, $confData);
$mesg .= eval("qq($Lang->{CfgEdit_Log_Copy_host_config})");
}
$mesg .= eval("qq($Lang->{CfgEdit_Log_Copy_host_config})");
}