diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-23 23:17:09 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2016-09-23 23:17:09 +0200 |
| commit | 6177b649ca8cd11545fe945245b449236ac4bd50 (patch) | |
| tree | 6b659b7b5d87b77549c0d12bd74557a9e6a4f1e7 | |
| parent | 4f272dd0323151a1390a8675bafebead0e2a69ad (diff) | |
| download | upstream-6177b649ca8cd11545fe945245b449236ac4bd50.tar.gz upstream-6177b649ca8cd11545fe945245b449236ac4bd50.tar.bz2 upstream-6177b649ca8cd11545fe945245b449236ac4bd50.zip | |
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>
| -rwxr-xr-x | scripts/package-metadata.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl index 44494efd28..09aed96c2b 100755 --- a/scripts/package-metadata.pl +++ b/scripts/package-metadata.pl @@ -193,12 +193,15 @@ sub mconf_depends { $m = "select"; next if $only_dep; + + $flags =~ /@/ or $depend = "PACKAGE_$depend"; } else { if ($vdep = $package{$depend}->{vdepends}) { $depend = join("||", map { "PACKAGE_".$_ } @$vdep); + } else { + $flags =~ /@/ or $depend = "PACKAGE_$depend"; } } - $flags =~ /@/ or $depend = "PACKAGE_$depend"; if ($condition) { if ($m =~ /select/) { next if $depend eq $condition; |