Reported by David Relson and others.
* Fix for CGI editor when deleting hash entries whose keys are
non alphanumeric. Report by David Relson.
# Version __VERSION__, __RELEASEDATE__
#------------------------------------------------------------------------
+* Fix for config.pl writing code to handle multi-line expressions.
+ Reported by David Relson and others.
+
+* Fix for CGI editor when deleting hash entries whose keys are
+ non alphanumeric. Report by David Relson.
+
+#------------------------------------------------------------------------
+# Version 3.0.0beta2, 18 Nov 2006
+#------------------------------------------------------------------------
+
* Fix for final md4 digest check on rsync transfers >= 512MB when protocol
version >= 27 and checksums are not cached. Reported by Garith Dugmore
and Dale Renton.
# you might have only one or two wakeups each night. This will keep
# the backup activity after hours. On the other hand, if you are backing
# up laptops that are only intermittently connected to the network you
-# will want to have frequent wakeups (eg: hourly) to maximized the chance
+# will want to have frequent wakeups (eg: hourly) to maximize the chance
# that each laptop is backed up.
#
# Examples:
#
#========================================================================
#
-# Version 3.0.0beta2, released 11 Nov 2006.
+# Version 3.0.0beta2, released 18 Nov 2006.
#
# See http://backuppc.sourceforge.net.
#
if ( !$isError && !$type->{noKeyEdit}
&& $In{deleteVar} !~ /^\Q${varName}_z_\E.*_z_/
- && $In{deleteVar} =~ /^\Q${varName}_z_\E(\w+)$/ ) {
+ && $In{deleteVar} =~ /^\Q${varName}_z_\E(.*)$/ ) {
#
# User deleted entry in this hash
#
#
#========================================================================
#
-# Version 3.0.0beta2, released 11 Nov 2006.
+# Version 3.0.0beta2, released 18 Nov 2006.
#
# See http://backuppc.sourceforge.net.
#
while ( <C> ) {
if ( /^\s*\$Conf\{([^}]*)\}\s*=(.*)/ ) {
my $var = $1;
+ $skipExpr = "\$fakeVar = $2\n";
if ( exists($newConf->{$var}) ) {
- $skipExpr = "\$fakeVar = $2\n";
my $d = Data::Dumper->new([$newConf->{$var}], [*value]);
$d->Indent(1);
$d->Terse(1);
} else {
$contents .= $_;
}
- if ( defined($skipExpr) ) {
+ if ( defined($skipExpr)
+ && ($skipExpr =~ /^\$fakeVar = *<</
+ || $skipExpr =~ /;[\n\r]*$/) ) {
#
# if we have a complete expression, then we are done
# skipping text from the original config file.