X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Fgen_deps.pl;h=de8572c762bedc58121ad7d66331a09645afabee;hb=732980a7fd77a207db18af3d441f663b1e54c373;hp=d75f06d6f6f8a99f02a82bb6681a8f665fdf16a1;hpb=e240cc0ea62aa7404ccf6187cc95cf6370212bef;p=openwrt-10.03%2F.git diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl index d75f06d6f..de8572c76 100755 --- a/scripts/gen_deps.pl +++ b/scripts/gen_deps.pl @@ -22,7 +22,7 @@ while ($line = <>) { $line =~ /^(Build-)?Depends: \s*(.+)\s*$/ and do { $pkg{$name}->{depends} ||= []; foreach my $v (split /\s+/, $2) { - next if $v =~ /^@/; + next if $v =~ /^[\+]?@/; $v =~ s/^\+//; push @{$pkg{$name}->{depends}}, $v; } @@ -38,8 +38,8 @@ foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) { my $depline = ""; foreach my $dep (@{$pkg{$name}->{depends}}) { my $idx; - if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) { - $idx = $pkg{$dep}->{src}; + if (defined $pkg{$dep}->{src}) { + ($pkg{$name}->{src} ne $pkg{$dep}->{src}) and $idx = $pkg{$dep}->{src}; } elsif (defined $pkg{$dep}) { $idx = $dep; }