Browse Source

install dependencies after installing package to avoid deep recursion and mass memory consuption

SVN-Revision: 10823
Nicolas Thill 17 năm trước cách đây
mục cha
commit
c7b3dff10c
1 tập tin đã thay đổi với 7 bổ sung7 xóa
  1. 7 7
      scripts/feeds

+ 7 - 7
scripts/feeds

@@ -264,13 +264,6 @@ sub install_package {
 	# newly installed packages set the source package
 	# newly installed packages set the source package
 	$installed{$src} and return 0;
 	$installed{$src} and return 0;
 
 
-	# install all dependencies
-	foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
-		next if $dep =~ /@/;
-		$dep =~ s/^\+//;
-		install_package($feed, $dep) == 0 or $ret = 1;
-	}
-
 	# check previously installed packages
 	# check previously installed packages
 	$installed{$name} and return 0;
 	$installed{$name} and return 0;
 	$installed{$src} = 1;
 	$installed{$src} = 1;
@@ -286,6 +279,13 @@ sub install_package {
 		return 1;
 		return 1;
 	};
 	};
 
 
+	# install all dependencies
+	foreach my $dep (@{$pkg->{depends}}, @{$pkg->{builddepends}}) {
+		next if $dep =~ /@/;
+		$dep =~ s/^\+//;
+		install_package($feed, $dep) == 0 or $ret = 1;
+	}
+
 	return $ret;
 	return $ret;
 }
 }