projects
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5689b63
)
metadata.pl: fix recursive handling of conditional dependencies
author
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 22 Apr 2010 15:39:20 +0000
(15:39 +0000)
committer
nbd
<nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 22 Apr 2010 15:39:20 +0000
(15:39 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21088
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
scripts/metadata.pl
patch
|
blob
|
history
diff --git
a/scripts/metadata.pl
b/scripts/metadata.pl
index
70d1b40
..
e0fb32f
100755
(executable)
--- a/
scripts/metadata.pl
+++ b/
scripts/metadata.pl
@@
-423,8
+423,9
@@
sub mconf_depends {
my $vdep;
my $condition = $parent_condition;
- next if $seen->{$depend};
- $seen->{$depend} = 1;
+ next if $condition eq $depend;
+ next if $seen->{"$parent_condition:$depend"};
+ $seen->{"$parent_condition:$depend"} = 1;
if ($depend =~ /^(.+):(.+)$/) {
if ($1 ne "PACKAGE_$pkgname") {
if ($condition) {
This page took
0.020797 seconds
and
4
git commands to generate.