Fixed bug, pakfire isntalls dependencies twice -> needs testing.

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

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index b9cead196b4721d0594ea436d435bb577d59c04a..e46b73410bd5287f265a2026a6136226878897d9 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";
@@ -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;
                
@@ -244,7 +255,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 +278,15 @@
                }
                
                ### Download first
-               foreach (sort @upgradepaks) {
-                       &Pakfire::getpak("$_", "");
+               foreach $pak (@upgradepaks) {
+                       system("mv $Conf::dbdir/meta/meta-$pak $Conf::dbdir/meta/old-meta-$pak");
+                       &Pakfire::getpak("$pak", "");
                }
                
-               foreach (sort @upgradepaks) {
-                       &Pakfire::upgradepak("$_");
+               foreach $pak (@upgradepaks) {
+                       if (&Pakfire::upgradepak("$pak")) {
+                               system("mv $Conf::dbdir/meta/old-meta-$pak $Conf::dbdir/meta/meta-$pak");
+                       }
                }
                
        } elsif ("$ARGV[0]" eq "list") {