use parent-dependencies for all dependencies of a package, not only those which are...
authorMirko Vogt <mirko@openwrt.org>
Fri, 10 Apr 2009 11:41:18 +0000 (11:41 +0000)
committerMirko Vogt <mirko@openwrt.org>
Fri, 10 Apr 2009 11:41:18 +0000 (11:41 +0000)
fixes bug #4917

SVN-Revision: 15187

scripts/metadata.pl

index 1c80be4..1971607 100755 (executable)
@@ -415,12 +415,12 @@ sub mconf_depends {
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;
-               my $condition;
+               my $condition = $parent_condition;
 
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {
-                               if ($parent_condition) {
-                                       $condition = "$parent_condition && $1";
+                               if ($condition) {
+                                       $condition = "$condition && $1";
                                } else {
                                        $condition = $1;
                                }