use parent-dependencies for all dependencies of a package, not only those which are...

fixes bug #4917

SVN-Revision: 15187

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 1c80be4bdbcd0ca908ca7d1194016de63551e71a..1971607ebb6f0576a3e323079b63e76090d563ba 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -415,12 +415,12 @@ sub mconf_depends {
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
                my $vdep;

-               my $condition;
+               my $condition = $parent_condition;

 
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {
 
                if ($depend =~ /^(.+):(.+)$/) {
                        if ($1 ne "PACKAGE_$pkgname") {

-                               if ($parent_condition) {
-                                       $condition = "$parent_condition && $1";
+                               if ($condition) {
+                                       $condition = "$condition && $1";

                                } else {
                                        $condition = $1;
                                }
                                } else {
                                        $condition = $1;
                                }