]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
pakfire.cgi: Remove "sleep" after running Pakfire command
authorLeo-Andres Hofmann <hofmann@leo-andres.de>
Thu, 2 Dec 2021 15:39:55 +0000 (16:39 +0100)
committerPeter Müller <peter.mueller@ipfire.org>
Fri, 14 Jan 2022 14:36:06 +0000 (14:36 +0000)
The extended lockfile test seems to be sufficient to detect
a running Pakfire process and display the logs.
"Sleep" even proved to be counterproductive, as fast processes
can finish in under a second and are then again not detected.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
html/cgi-bin/pakfire.cgi

index 72518a6fe644e153cdc5a1ef9952ab6422da0b42..e14658ffb2bb394c183d35abee07c3eb2f5e94de 100644 (file)
@@ -149,7 +149,6 @@ if (($cgiparams{'ACTION'} eq 'install') && (! &_is_pakfire_busy())) {
        my @pkgs = split(/\|/, $cgiparams{'INSPAKS'});
        if ("$cgiparams{'FORCE'}" eq "on") {
                &General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs);
-               sleep(1);
        } else {
                &Header::openbox("100%", "center", $Lang::tr{'request'});
                my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
@@ -187,7 +186,6 @@ END
        my @pkgs = split(/\|/, $cgiparams{'DELPAKS'});
        if ("$cgiparams{'FORCE'}" eq "on") {
                &General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs);
-               sleep(1);
        } else {
                &Header::openbox("100%", "center", $Lang::tr{'request'});
                my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
@@ -224,10 +222,8 @@ END
 
 } elsif (($cgiparams{'ACTION'} eq 'update') && (! &_is_pakfire_busy())) {
        &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
-       sleep(1);
 } elsif (($cgiparams{'ACTION'} eq 'upgrade') && (! &_is_pakfire_busy())) {
        &General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors");
-       sleep(1);
 } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
        $pakfiresettings{"TREE"} = $cgiparams{"TREE"};
 
@@ -241,7 +237,6 @@ END
 
                # Update lists
                &General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
-               sleep(1);
        }
 }