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

btrbk: map empty value to "yes" in configuration

pull/286/head
Axel Burri 2019-04-17 15:42:05 +02:00
parent 1503a07ad1
commit ae004e48fd
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
btrbk
View File

@ -3531,7 +3531,17 @@ sub append_config_option($$$$;@)
return undef;
}
if(grep(/^\Q$value\E$/, @{$opt->{accept}})) {
if($value eq "") {
if(grep(/^yes$/, @{$opt->{accept}})) {
$value = "yes";
TRACE "option \"$key\" has no value, accepted map to \"yes\"";
}
else {
ERROR "Unsupported empty value for option \"$key\" $error_statement";
return undef;
}
}
elsif(grep(/^\Q$value\E$/, @{$opt->{accept}})) {
TRACE "option \"$key=$value\" found in accept list";
}
elsif($opt->{accept_numeric} && ($value =~ /^[0-9]+$/)) {
@ -3813,10 +3823,10 @@ sub parse_config(@)
s/\s*$//; # remove trailing whitespace
next if /^\s*$/; # ignore empty lines
TRACE "config: parsing line $. with context=$cur->{CONTEXT}: \"$_\"";
if(/^(\s*)([a-zA-Z_]+)\s+(.*)$/)
if(/^(\s*)([a-zA-Z_]+)(\s+(.*))?$/)
{
# NOTE: we do not perform checks on indentation!
my ($indent, $key, $value) = (length($1), lc($2), $3);
my ($indent, $key, $value) = (length($1), lc($2), $4 // "");
$cur = parse_config_line($file, $root, $cur, $key, $value);
unless(defined($cur)) {
# error, bail out