Browse Source

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 <[email protected]>
Matthias Schiffer 9 years ago
parent
commit
6177b649ca
1 changed files with 4 additions and 1 deletions
  1. 4 1
      scripts/package-metadata.pl

+ 4 - 1
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;