Fixed dependency handling for feeds

[openwrt-10.03/.git] / scripts / feeds

diff --git a/scripts/feeds b/scripts/feeds
index 6b09f7ee4152d734a7018df46a6c6e8fe3d00396..099468a8f73cc11adae0bf879455ef22c05ae41e 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -23,7 +23,9 @@ sub parse_config() {
        my $line = 0;
        my %name;
 
-       open FEEDS, "feeds.conf";
+       open FEEDS, "feeds.conf" or
+               open FEEDS, "feeds.conf.default" or
+               die "Unable to open feeds configuration";
        while (<FEEDS>) {
                chomp;
                s/#.+$//;
@@ -100,7 +102,7 @@ sub update_git($$) {
                system("GIT_DIR=./feeds/$name/.git git pull") == 0 or return 1;
        } else {
                system("rm -rf \"./feeds/$name\"");
-               system("git-clone --depth 1 $src ./feeds/$name") == 0 or return 1;
+               system("git clone --depth 1 $src ./feeds/$name") == 0 or return 1;
        }
 
        return 0;
@@ -284,7 +286,7 @@ sub install_package {
        };
 
        # install all dependencies
-       foreach my $vpkg (@{$srcpackage{$src}}) {
+       foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;
                        $dep =~ s/^\+//;