From 396478fcc2ed755e02e2573c8be89e9a98aec512 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 20:40:30 +0200 Subject: Merging upstream version 1.22.5. Signed-off-by: Daniel Baumann --- scripts/Dpkg/BuildOptions.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'scripts/Dpkg/BuildOptions.pm') diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm index 5b53655..6c2a189 100644 --- a/scripts/Dpkg/BuildOptions.pm +++ b/scripts/Dpkg/BuildOptions.pm @@ -180,13 +180,11 @@ sub parse_features { my $value = ($1 eq '+') ? 1 : 0; if ($feature eq 'all') { $use_feature->{$_} = $value foreach keys %{$use_feature}; + } elsif (exists $use_feature->{$feature}) { + $use_feature->{$feature} = $value; } else { - if (exists $use_feature->{$feature}) { - $use_feature->{$feature} = $value; - } else { - warning(g_('unknown %s feature in %s variable: %s'), - $option, $self->{envvar}, $feature); - } + warning(g_('unknown %s feature in %s variable: %s'), + $option, $self->{envvar}, $feature); } } else { warning(g_('incorrect value in %s option of %s variable: %s'), -- cgit v1.2.3