projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Changes in preparation for 3.2.0beta1...
[BackupPC.git]
/
lib
/
BackupPC
/
Storage
/
Text.pm
diff --git
a/lib/BackupPC/Storage/Text.pm
b/lib/BackupPC/Storage/Text.pm
index
09140fe
..
0f22932
100644
(file)
--- a/
lib/BackupPC/Storage/Text.pm
+++ b/
lib/BackupPC/Storage/Text.pm
@@
-12,7
+12,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2004-200
7
Craig Barratt
+# Copyright (C) 2004-200
9
Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-30,7
+30,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 3.2.0
, released 31 Dec 2008
.
+# Version 3.2.0
beta0, released 5 April 2009
.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-274,25
+274,25
@@
sub ConfigPath
sub ConfigDataRead
{
sub ConfigDataRead
{
- my($s, $host) = @_;
+ my($s, $host
, $prevConfig
) = @_;
my($ret, $mesg, $config, @configs);
#
# TODO: add lock
#
my($ret, $mesg, $config, @configs);
#
# TODO: add lock
#
- my $conf = {};
+ my $conf =
$prevConfig ||
{};
my $configPath = $s->ConfigPath($host);
push(@configs, $configPath) if ( -f $configPath );
foreach $config ( @configs ) {
my $configPath = $s->ConfigPath($host);
push(@configs, $configPath) if ( -f $configPath );
foreach $config ( @configs ) {
- %Conf =
()
;
+ %Conf =
%$conf
;
if ( !defined($ret = do $config) && ($! || $@) ) {
$mesg = "Couldn't open $config: $!" if ( $! );
$mesg = "Couldn't execute $config: $@" if ( $@ );
$mesg =~ s/[\n\r]+//;
return ($mesg, $conf);
}
if ( !defined($ret = do $config) && ($! || $@) ) {
$mesg = "Couldn't open $config: $!" if ( $! );
$mesg = "Couldn't execute $config: $@" if ( $@ );
$mesg =~ s/[\n\r]+//;
return ($mesg, $conf);
}
- %$conf =
( %$conf, %Conf )
;
+ %$conf =
%Conf
;
}
#
}
#