scripts/package-metadata.pl: fix generation of dependencies on virtual packages

Dependencies on purely virtual packages (satisfied by PROVIDES) that were
not using "selects" ("+" flag) would be prepended with the prefix
"PACKAGE_" twice, breaking the first alternative.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
master
Matthias Schiffer 8 years ago
parent 4f272dd032
commit 6177b649ca
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
  1. 5
      scripts/package-metadata.pl

@ -193,12 +193,15 @@ sub mconf_depends {
$m = "select"; $m = "select";
next if $only_dep; next if $only_dep;
$flags =~ /@/ or $depend = "PACKAGE_$depend";
} else { } else {
if ($vdep = $package{$depend}->{vdepends}) { if ($vdep = $package{$depend}->{vdepends}) {
$depend = join("||", map { "PACKAGE_".$_ } @$vdep); $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
} else {
$flags =~ /@/ or $depend = "PACKAGE_$depend";
} }
} }
$flags =~ /@/ or $depend = "PACKAGE_$depend";
if ($condition) { if ($condition) {
if ($m =~ /select/) { if ($m =~ /select/) {
next if $depend eq $condition; next if $depend eq $condition;

Loading…
Cancel
Save