summaryrefslogtreecommitdiff
path: root/substitutedeps
diff options
context:
space:
mode:
authorMichael Schröder <mls@suse.de>2007-01-29 06:17:46 +0000
committerMichael Schröder <mls@suse.de>2007-01-29 06:17:46 +0000
commitf2178d524a5a249284ceeeb7401b0b3ed1ba9d93 (patch)
tree3d2aaf6c5d6b15e87e3b4ba4fe739ce20fc8001c /substitutedeps
parent8db288834af77f944fc2c2ed01e34f5dc57e7dda (diff)
downloadbuild-f2178d524a5a249284ceeeb7401b0b3ed1ba9d93.tar.gz
build-f2178d524a5a249284ceeeb7401b0b3ed1ba9d93.tar.bz2
build-f2178d524a5a249284ceeeb7401b0b3ed1ba9d93.zip
- fix read_spec call, oops...
Diffstat (limited to 'substitutedeps')
-rwxr-xr-xsubstitutedeps9
1 files changed, 3 insertions, 6 deletions
diff --git a/substitutedeps b/substitutedeps
index 9b08725..8093d12 100755
--- a/substitutedeps
+++ b/substitutedeps
@@ -46,13 +46,10 @@ my $cf = Build::read_config_dist($dist, $archs, $configdir);
#######################################################################
-my ($packname, $packvers, $subpacks, @packdeps);
-$subpacks = [];
-
my $xspec = [];
-($packname, $packvers, $subpacks, @packdeps) = Build::read_spec($cf, $spec, $xspec);
-my @sdeps = @packdeps;
-my @neg = map {substr($_, 1)} grep {/^-/} @packdeps;
+my $d = Build::read_spec($cf, $spec, $xspec) || {};
+my @sdeps = @{$d->{'deps'} || []};
+my @neg = map {substr($_, 1)} grep {/^-/} @{$d->{'deps'} || []};
my %neg = map {$_ => 1} @neg;
@sdeps = grep {!$neg{$_}} @sdeps;
@sdeps = Build::do_subst($cf, @sdeps);