install dependencies after installing package to avoid deep recursion and mass memory consuption
SVN-Revision: 10823
This commit is contained in:
		| @@ -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; | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Nicolas Thill
					Nicolas Thill