- bring prereqs handling in sync with the obs backend

perlpunk · Aug 20, 2012 · 2d83551 · 2d83551
1 parent 5bd73cd
commit 2d83551
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/expanddeps b/expanddeps
@@ -258,8 +258,9 @@ if ($spec) {
   $packvers = $d->{'version'};
   $subpacks = $d->{'subpacks'};
   @packdeps = @{$d->{'deps'} || []};
-  for my $pr (@{$d->{'prereqs'} || []}) {
-    push @packdeps, $pr unless grep {$_ eq $pr} @$subpacks;
+  if ($d->{'prereqs'}) {
+    my %deps = map {$_ => 1} (@packdeps, @{$d->{'subpacks'} || []});
+    push @packdeps, grep {!$deps{$_} && !/^%/} @{$d->{'prereqs'}};
   }
 }