Load libata prior udev at installer because some SATA doesnt autoload it

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

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index b9cead196b4721d0594ea436d435bb577d59c04a..a9981fd8325f7f867d334d405b48a9895097237f 100644 (file)
--- 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;
@@ -45,7 +50,7 @@
        #
        if ( $0 =~ /pakfire-update$/ ) {
                &Pakfire::message("CRON INFO: Running an update");
-               my $random = int(rand(3600));
+               my $random = int(rand(60));
                &Pakfire::logger("CRON INFO: Waiting for $random seconds.");
                sleep($random);
                $ARGV[0] = "update";
@@ -244,7 +249,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 +272,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") {