Pakfire aktualisiert jetzt die Pakete nichtmehr in der Schleife.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@893 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index f00d31b0fa398f2f774251e39166b5b901a7ffc6..dc38c00b12c33c82d5e588bff514f1cd9f550a77 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -710,7 +710,7 @@ sub upgradepak {
        if ($return == 0) {
          move("$Conf::tmpdir/ROOTFILES", "$Conf::dbdir/rootfiles/$pak");
          cleanup("tmp");
-               copy("$Conf::dbdir/meta/meta-$pak","$Conf::dbdir/installed/");
+               copy("$Conf::dbdir/meta/meta-$pak", "$Conf::dbdir/installed/");
                message("PAKFIRE UPGR: $pak: Finished.");
                message("");
        } else {

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index b9cead196b4721d0594ea436d435bb577d59c04a..19c090486c709f82658ce85239a83a215edec6fd 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -244,7 +244,7 @@
        } elsif ("$ARGV[0]" eq "upgrade") {
                &Pakfire::upgradecore();
                my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
-               my @temp;
+               my @temp, $pak;
                
                foreach (@upgradepaks) {
                        @temp = &Pakfire::resolvedeps("$_");
@@ -267,12 +267,15 @@
                }
                
                ### Download first
-               foreach (sort @upgradepaks) {
-                       &Pakfire::getpak("$_", "");
+               foreach $pak (sort @upgradepaks) {
+                       system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
+                       &Pakfire::getpak("$pak", "");
                }
                
-               foreach (sort @upgradepaks) {
-                       &Pakfire::upgradepak("$_");
+               foreach $pak (sort @upgradepaks) {
+                       if (&Pakfire::upgradepak("$pak")) {
+                               system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
+                       }
                }
                
        } elsif ("$ARGV[0]" eq "list") {