ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: add "meta" context for config defaults 

Preparatory patch to allow multiple identical config keys in same
section.
pull/204/merge
Axel Burri 2018-02-13 18:40:35 +01:00
parent b2b43cf199
commit 3aaafa3d88
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
btrbk
View File

@ -3012,7 +3012,7 @@ sub config_key($$;@)
} }
while(not exists($config->{$key})) { while(not exists($config->{$key})) {
# note: while all config keys exist in root context (at least with default values), # note: while all config keys exist in "meta" context (at least with default values),
# we also allow fake configs (CONTEXT="cmdline") which have no PARENT. # we also allow fake configs (CONTEXT="cmdline") which have no PARENT.
return undef unless($config->{PARENT}); return undef unless($config->{PARENT});
$config = $config->{PARENT}; $config = $config->{PARENT};
@ -3102,14 +3102,6 @@ sub config_dump_keys($;@)
next unless exists($config->{$key}); next unless exists($config->{$key});
$val = $config->{$key}; $val = $config->{$key};
} }
if($opts{skip_defaults}) {
if(defined($config_options{$key}->{default}) && defined($val)) {
next if($val eq $config_options{$key}->{default});
}
if((not defined($config_options{$key}->{default})) && (not (defined($val)))) {
next; # both undef, skip
}
}
if(defined($val)) { if(defined($val)) {
if($config_options{$key}->{accept_preserve_matrix}) { if($config_options{$key}->{accept_preserve_matrix}) {
$val = format_preserve_matrix($val); $val = format_preserve_matrix($val);
@ -3387,14 +3379,13 @@ sub _config_propagate_target
sub init_config(@) sub init_config(@)
{ {
my %config_root = ( CONTEXT => "root", SUBSECTION => [], @_ ); my %defaults = ( CONTEXT => "meta", @_ );
# set defaults # set defaults
foreach (keys %config_options) { foreach (keys %config_options) {
next if $config_options{$_}->{deprecated}; # don't pollute hash with deprecated options next if $config_options{$_}->{deprecated}; # don't pollute hash with deprecated options
$config_root{$_} = $config_options{$_}->{default}; $defaults{$_} = $config_options{$_}->{default};
} }
return \%config_root; return { CONTEXT => "root", SUBSECTION => [], PARENT => \%defaults };
} }
@ -3971,7 +3962,7 @@ sub print_header(@)
print " Date: " . localtime($args{time}) . "\n"; print " Date: " . localtime($args{time}) . "\n";
} }
if($config) { if($config) {
print " Config: $config->{SRC_FILE}\n"; print " Config: " . config_key($config, "SRC_FILE") . "\n";
} }
if($dryrun) { if($dryrun) {
print " Dryrun: YES\n"; print " Dryrun: YES\n";
@ -5002,7 +4993,7 @@ MAIN:
# print configuration lines, machine readable # print configuration lines, machine readable
# #
my @out; my @out;
push @out, config_dump_keys($config, skip_defaults => 1); push @out, config_dump_keys($config, resolve => $resolve);
foreach my $sroot (vinfo_subsection($config, 'volume')) { foreach my $sroot (vinfo_subsection($config, 'volume')) {
push @out, "\nvolume $sroot->{URL}"; push @out, "\nvolume $sroot->{URL}";
push @out, config_dump_keys($sroot, prefix => "\t", resolve => $resolve); push @out, config_dump_keys($sroot, prefix => "\t", resolve => $resolve);