From 2d83551360518760a6ae85ecfe9f216b0800047e Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Mon, 20 Aug 2012 11:04:10 +0200 Subject: [PATCH] - bring prereqs handling in sync with the obs backend --- expanddeps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/expanddeps b/expanddeps index a96d99e..a40bd33 100755 --- 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'}}; } } -- 2.7.4