Pakfire Update.

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

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 7ab6f7395c5f2767fea44e4618922b78f7576cd9..750e6e00b3bc5b3b649ee104061d34f77cf652ae 100644 (file)
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -163,7 +163,6 @@
                
                my @paks;
                my $pak;
-               
                foreach $pak (@ARGV) {
                        unless ("$pak" =~ "^-") {
                                $return = &Pakfire::isinstalled($pak);
@@ -171,9 +170,7 @@
                                        &Pakfire::message("PAKFIRE WARN: $pak is not installed");
                                        next;
                                }
-                       
                                push(@paks, $pak);
-                       
                        }
                }
                
@@ -208,14 +205,11 @@
        
        
        } elsif ("$ARGV[0]" eq "update") {
-               my $force = "noforce";
                &Pakfire::makeuuid();
                &Pakfire::senduuid();
                &Pakfire::getmirrors();
-               $force = "force" if ("$ARGV[1]" eq "--force");
-               &Pakfire::dbgetlist("$force");
-               
-       
+               &Pakfire::dbgetlist("force");
+
        } elsif ("$ARGV[0]" eq "upgrade") {
                my @upgradepaks = &Pakfire::dblist("upgrade", "noweb");
                my @temp;
@@ -250,7 +244,12 @@
                }
                
        } elsif ("$ARGV[0]" eq "list") {
-               &Pakfire::dblist("all", "noweb");
+               if ("$ARGV[1]" =~ /installed|notinstalled/) {
+                       &Pakfire::dblist("$ARGV[1]", "noweb");
+               } else {
+                       &Pakfire::message("PAKFIRE WARN: Not a known option $ARGV[1]") if ($ARGV[1]); 
+                       &Pakfire::dblist("all", "noweb");
+               }
                
        } elsif ("$ARGV[0]" eq "resolvedeps") {
                foreach (@ARGV) {