From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 4/4] pakfire.cgi: Remove "sleep" after running Pakfire command Date: Thu, 02 Dec 2021 16:39:55 +0100 Message-ID: <20211202153955.1126-4-hofmann@leo-andres.de> In-Reply-To: <20211202153955.1126-1-hofmann@leo-andres.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4693253291809663066==" List-Id: --===============4693253291809663066== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 --- html/cgi-bin/pakfire.cgi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 72518a6fe..e14658ffb 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -149,7 +149,6 @@ if (($cgiparams{'ACTION'} eq 'install') && (! &_is_pakfir= e_busy())) { my @pkgs =3D split(/\|/, $cgiparams{'INSPAKS'}); if ("$cgiparams{'FORCE'}" eq "on") { &General::system_background("/usr/local/bin/pakfire", "install", "--non-in= teractive", "--no-colors", @pkgs); - sleep(1); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output =3D &General::system_output("/usr/local/bin/pakfire", "resolved= eps", "--no-colors", @pkgs); @@ -187,7 +186,6 @@ END my @pkgs =3D split(/\|/, $cgiparams{'DELPAKS'}); if ("$cgiparams{'FORCE'}" eq "on") { &General::system_background("/usr/local/bin/pakfire", "remove", "--non-int= eractive", "--no-colors", @pkgs); - sleep(1); } else { &Header::openbox("100%", "center", $Lang::tr{'request'}); my @output =3D &General::system_output("/usr/local/bin/pakfire", "resolved= eps", "--no-colors", @pkgs); @@ -224,10 +222,8 @@ END =20 } 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", "--n= o-colors"); - sleep(1); } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") { $pakfiresettings{"TREE"} =3D $cgiparams{"TREE"}; =20 @@ -241,7 +237,6 @@ END =20 # Update lists &General::system_background("/usr/local/bin/pakfire", "update", "--force",= "--no-colors"); - sleep(1); } } =20 --=20 2.27.0.windows.1 --===============4693253291809663066==--