X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fpakfire%2Fpakfire;h=e46b73410bd5287f265a2026a6136226878897d9;hp=1c4a2f67d0bb68e16738f36ce6b7ce2e6e165f3f;hb=519f8431c01b7606233c19b9a513fd82b9293896;hpb=fc4ac7acab40e5f82d444c1144ed0a60f0a3b3ff

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 1c4a2f67d0..e46b73410b 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -19,6 +19,11 @@
 #                                                                             #
 ###############################################################################
 
+	### Clean up our environment
+	#
+	delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
+	$< = $>;
+
 	require "/opt/pakfire/lib/functions.pl";
 	
 	my $interactive = 1;
@@ -131,26 +136,26 @@
 			exit 1;
 		}
 
-		&Pakfire::message("");
-		&Pakfire::message("");
-		&Pakfire::message("PAKFIRE INFO: Packages to install:");
-		foreach $pak (sort @paks) {
-		  my $size = &Pakfire::getsize("$pak");
-			$size = &Pakfire::beautifysize($size);
-		  &Pakfire::message("PAKFIRE INFO: $pak \t - $size");
-		}
-		
 		if (@deps) {
 			my %sort = map{ $_, 1 } @deps;
 			@deps = sort keys %sort;
 			&Pakfire::message("");
 			&Pakfire::message("PAKFIRE INFO: Packages to install for dependencies:");
 		}
-		foreach $dep (sort @deps) {
+		foreach $dep (@deps) {
 		  my $size = &Pakfire::getsize("$dep");
 			$size = &Pakfire::beautifysize($size);
 		  &Pakfire::message("PAKFIRE INFO: $dep \t - $size");
 		}
+
+		&Pakfire::message("");
+		&Pakfire::message("");
+		&Pakfire::message("PAKFIRE INFO: Packages to install:");
+		foreach $pak (@paks) {
+		  my $size = &Pakfire::getsize("$pak");
+			$size = &Pakfire::beautifysize($size);
+		  &Pakfire::message("PAKFIRE INFO: $pak \t - $size");
+		}
 		
 		my $totalsize;
 		foreach $pak (@all) {
@@ -174,20 +179,26 @@
 			&Pakfire::logger("PAKFIRE INFO: Interaction skipped.");
 		}
 		
-		my %sort = map{ $_, 1 } @all;
-		@all = sort keys %sort;
+#		my %sort = map{ $_, 1 } @all;
+#		@all = sort keys %sort;
 
 		### Download first
-		foreach $pak (sort @all) {
+		foreach $pak (@all) {
 			&Pakfire::getpak("$pak", "");
 		}
 
 		&Pakfire::message("");
 
-		foreach $pak (sort @all) {
+		foreach $pak (@deps) {
 			&Pakfire::setuppak("$pak") if ($pak ne "");
 		}
 		
+
+		foreach $pak (@paks) {
+			&Pakfire::setuppak("$pak") if ($pak ne "");
+		}
+		
+
 	} elsif ("$ARGV[0]" eq "remove") {
 		shift;
 		
@@ -267,12 +278,12 @@
 		}
 		
 		### Download first
-		foreach $pak (sort @upgradepaks) {
+		foreach $pak (@upgradepaks) {
 			system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
 			&Pakfire::getpak("$pak", "");
 		}
 		
-		foreach $pak (sort @upgradepaks) {
+		foreach $pak (@upgradepaks) {
 			if (&Pakfire::upgradepak("$pak")) {
 				system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
 			}