From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] pakfire.cgi: Give pakfire time to write lockfile when
 update/upgrade.
Date: Tue, 12 Oct 2021 19:23:13 +0200
Message-ID: <579a369b-bafc-2549-0831-b4e946c5f4f7@ipfire.org>
In-Reply-To: <20211012164240.3546-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4112859087524423466=="
List-Id: <development.lists.ipfire.org>

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

Acked-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>

> In case the package list should be grabbed or the system should be
> upgraded, pakfire got called which writes a lock file to prevent from
> beeing launched multiple times and to lock the pakfire.cgi with the nice
> log output.
>=20
> In case update or upgrade has been performed via WUI, pakfire has been call=
ed
> and written the file in the background but the WUI script has been
> executed further and because of a race condition it did not recognize
> the lockfile at this moment because it was not present.
>=20
> So a simple sleep should to the trick and give pakfire the required time
> to write out it's lockfile.
>=20
> Fixes #12696.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
>  html/cgi-bin/pakfire.cgi | 2 ++
>  1 file changed, 2 insertions(+)
>=20
> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
> index 0cf522ba1..aaf63d469 100644
> --- a/html/cgi-bin/pakfire.cgi
> +++ b/html/cgi-bin/pakfire.cgi
> @@ -133,8 +133,10 @@ END
> =20
>  } elsif (($cgiparams{'ACTION'} eq 'update') && (! -e $Pakfire::lockfile)) {
>  	&General::system_background("/usr/local/bin/pakfire", "update", "--force"=
, "--no-colors");
> +	sleep(1);
>  } elsif (($cgiparams{'ACTION'} eq 'upgrade') && (!-e $Pakfire::lockfile)) {
>  	&General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "-=
-no-colors");
> +	sleep(1);
>  } elsif ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}") {
>  	$pakfiresettings{"TREE"} =3D $cgiparams{"TREE"};
> =20
>=20

--===============4112859087524423466==--