Pakfire: Update also the meta db at package list update.

[people/pmueller/ipfire-2.x.git] / src / pakfire / pakfire

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index a9981fd8325f7f867d334d405b48a9895097237f..3d0270aa41db8fb49f0f4f1002c9ba1e826606e6 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -136,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;
+                       @deps = 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) {
@@ -179,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;
                
@@ -272,14 +278,14 @@
                }
                
                ### Download first
-               foreach $pak (sort @upgradepaks) {
-                       system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
+               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");
+                               #system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
                        }
                }