Kleine Fixes am Pakfire - brauche Binary.

[ipfire-2.x.git] / src / pakfire / lib / functions.pl

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 48c34e91050dff03add509166e91129f54d54c19..000b2cfc82ec270d47e44142c4e27dd849475f07 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -54,6 +54,7 @@ sub fetchfile {
                        $file = "$server[2]/$getfile";
                } else {
                        $host = $gethost;
+                       $file = $getfile;
                }
                
                $proto = "HTTP" unless $proto;
@@ -62,7 +63,7 @@ sub fetchfile {
 
                my $ua = LWP::UserAgent->new;
                $ua->agent("Pakfire/$Conf::version");
-               #$ua->timeout(5);
+               $ua->timeout(5);
                #$ua->env_proxy;
         
                my $response = $ua->get("http://$host/$file");
@@ -189,9 +190,9 @@ sub dblist {
                @templine = split(/\;/,$line);
                ### filter here...
                if ("$forweb" eq "forweb") {
-                       print "<option value=\"$templine[0]\">$templine[1]</option>\n";
+                       print "<option value=\"$templine[0]\">$templine[0]-$templine[1]-$templine[2]</option>\n";
                } else {
-                       print "$templine[0] $templine[1]\n";
+                       print "Name: $templine[0]\nVersion: $templine[1]\nRelease: $templine[2]\n\n";
                }
        }
 }
@@ -325,7 +326,7 @@ sub decryptpak {
        my $return = system("gpg -d < $Conf::cachedir/$file | tar xj -C $Conf::tmpdir/");
        
        logger("Decryption process returned the following: $return");
-       if ($return == 1) { exit 1; }
+       if ($return != 1) { exit 1; }
 }
 
 sub getpak {
@@ -354,8 +355,6 @@ sub getpak {
                exit 1;
        }
        
-       #message("\n## Downloading $file...");
-       
        unless ( "$force" eq "force" ) {
                if ( -e "$Conf::cachedir/$file" ) {
                        return $file;
@@ -451,7 +450,6 @@ sub beautifysize {
 
 sub makeuuid {
        unless ( -e "$Conf::dbdir/uuid" ) {
-               message("Creating a random key...");
                open(FILE, "</proc/sys/kernel/random/uuid");
                my @line = <FILE>;
                close(FILE);