diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 18:40:30 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 18:40:30 +0000 |
| commit | 396478fcc2ed755e02e2573c8be89e9a98aec512 (patch) | |
| tree | 5f3b06ddc745429831d93323182288ade533804f /scripts/Dpkg/BuildOptions.pm | |
| parent | Adding debian version 1.22.4. (diff) | |
| download | dpkg-396478fcc2ed755e02e2573c8be89e9a98aec512.tar.xz dpkg-396478fcc2ed755e02e2573c8be89e9a98aec512.zip | |
Merging upstream version 1.22.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | scripts/Dpkg/BuildOptions.pm | 10 |
1 files changed, 4 insertions, 6 deletions
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'), |