From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] pakfire.cgi: Check for locked pakfire before trying to
 perform operations.
Date: Mon, 24 May 2021 19:38:21 +0200
Message-ID: <20210524173821.4596-2-stefan.schantl@ipfire.org>
In-Reply-To: <20210524173821.4596-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4662720457360384519=="
List-Id: <development.lists.ipfire.org>

--===============4662720457360384519==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Fixes #12621.

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 html/cgi-bin/pakfire.cgi | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index a9e12d23c..faaeb4222 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -54,7 +54,7 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http=
-equiv=3D'refresh' cont
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1);
 &Header::openbigbox('100%', 'left', '', $errormessage);
=20
-if ($cgiparams{'ACTION'} eq 'install'){
+if (($cgiparams{'ACTION'} eq 'install') && (! -e $Pakfire::lockfile)) {
 	$cgiparams{'INSPAKS'} =3D~ s/\|/\ /g;
 	if ("$cgiparams{'FORCE'}" eq "on") {
 		my $command =3D "/usr/local/bin/pakfire install --non-interactive --no-col=
ors $cgiparams{'INSPAKS'} &>/dev/null &";
@@ -93,7 +93,7 @@ END
 		&Header::closepage();
 		exit;
 	}
-} elsif ($cgiparams{'ACTION'} eq 'remove') {
+} elsif (($cgiparams{'ACTION'} eq 'remove') && (! -e $Pakfire::lockfile)) {
=20
 	$cgiparams{'DELPAKS'} =3D~ s/\|/\ /g;
 	if ("$cgiparams{'FORCE'}" eq "on") {
@@ -134,11 +134,11 @@ END
 		exit;
 	}
=20
-} elsif ($cgiparams{'ACTION'} eq 'update') {
+} elsif (($cgiparams{'ACTION'} eq 'update') && (! -e $Pakfire::lockfile)) {
=20
 	system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
 	system("/bin/sleep 1");
-} elsif ($cgiparams{'ACTION'} eq 'upgrade') {
+} elsif (($cgiparams{'ACTION'} eq 'upgrade') && (!-e $Pakfire::lockfile)) {
 	my $command =3D "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null =
&";
 	system("$command");
 	system("/bin/sleep 1");
@@ -176,9 +176,7 @@ if ($errormessage) {
 	&Header::closebox();
 }
=20
-my $return =3D `pidof pakfire`;
-chomp($return);
-if ($return) {
+if (-e $Pakfire::lockfile) {
 	&Header::openbox( 'Waiting', 1, "<meta http-equiv=3D'refresh' content=3D'10=
;'>" );
 	print <<END;
 	<table>
--=20
2.20.1


--===============4662720457360384519==--