X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=scripts%2Ffeeds;h=f1baad5766dd2742c78c40211a5afd1f9e0b6f90;hb=51d02a9a2e21c50a7dbd045b28b7f7e876396b8c;hp=186144ef38636649bb220fa06d983f89adf9e341;hpb=c50d2a30f6038bdf66aea8bad7802371bbf9659a;p=openwrt-10.03%2F.git

diff --git a/scripts/feeds b/scripts/feeds
index 186144ef3..f1baad576 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -104,9 +104,15 @@ sub update_git($$) {
 
 sub get_feed($) {
 	my $feed = shift;
+	my $file = "./feeds/$feed.index";
 
 	clear_packages();
-	parse_package_metadata("./feeds/$feed.index") or return;
+
+	-f $file or do {
+		print "Ignoring feed '$feed' - index missing\n";
+		return;
+	};
+	parse_package_metadata($file) or return;
 	return { %package };
 }
 
@@ -258,13 +264,6 @@ sub install_package {
 	# newly installed packages set the source package
 	$installed{$src} and return 0;
 
-	# install all dependencies
-	foreach my $dep (@{$pkg->{depends}}) {
-		next if $dep =~ /@/;
-		$dep =~ s/^\+//;
-		install_package($feed, $dep) == 0 or $ret = 1;
-	}
-
 	# check previously installed packages
 	$installed{$name} and return 0;
 	$installed{$src} = 1;
@@ -280,6 +279,15 @@ sub install_package {
 		return 1;
 	};
 
+	# install all dependencies
+	foreach my $vpkg (@{$srcpackage{$src}}) {
+		foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
+			next if $dep =~ /@/;
+			$dep =~ s/^\+//;
+			install_package($feed, $dep) == 0 or $ret = 1;
+		}
+	}
+
 	return $ret;
 }