From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo-Andres Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject:
 [PATCH 4/7] pakfire.cgi: Notify user if Pakfire is already performing a task
Date: Sun, 08 May 2022 14:09:49 +0200
Message-ID: <20220508120952.52-4-hofmann@leo-andres.de>
In-Reply-To: <20220508120952.52-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6433606393686986089=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
---
 html/cgi-bin/pakfire.cgi | 6 ++++--
 langs/de/cgi-bin/de.pl   | 1 +
 langs/en/cgi-bin/en.pl   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index daa82e34c..ec3ee2cc6 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -96,8 +96,10 @@ if($cgiparams{'ACTION'} eq 'json-getstatus') {
 }
=20
 ### Process Pakfire install/update commands ###
-if(($cgiparams{'ACTION'} ne '') && (! &_is_pakfire_busy())) {
-	if(($cgiparams{'ACTION'} eq 'install') && ($cgiparams{'FORCE'} eq 'on')) {
+if($cgiparams{'ACTION'} ne '') {
+	if(&_is_pakfire_busy()) {
+		$errormessage =3D $Lang::tr{'pakfire already busy'};
+	} elsif(($cgiparams{'ACTION'} eq 'install') && ($cgiparams{'FORCE'} eq 'on'=
)) {
 		my @pkgs =3D split(/\|/, $cgiparams{'INSPAKS'});
 		&General::system_background("/usr/local/bin/pakfire", "install", "--non-in=
teractive", "--no-colors", @pkgs);
 	} elsif(($cgiparams{'ACTION'} eq 'remove') && ($cgiparams{'FORCE'} eq 'on')=
) {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a841b39f9..7a39e233b 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1990,6 +1990,7 @@
 'pagerefresh' =3D> 'Seite wird aktualisiert. Bitte warten.',
 'pakfire accept all' =3D> 'M=C3=B6chten Sie der Installation aller Pakete zu=
stimmen?',
 'pakfire ago' =3D> 'her.',
+'pakfire already busy' =3D> 'Pakfire f=C3=BChrt bereits eine Aufgabe aus. Bi=
tte versuchen Sie es sp=C3=A4ter erneut.',
 'pakfire available addons' =3D> 'Verf=C3=BCgbare Addons:',
 'pakfire configuration' =3D> 'Pakfire Konfiguration',
 'pakfire core update auto' =3D> 'Core- und Addon-Updates automatisch install=
ieren:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e30ee4f69..f90e3103b 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2041,6 +2041,7 @@
 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.',
 'pakfire accept all' =3D> 'Do you want to install all packages?',
 'pakfire ago' =3D> 'ago.',
+'pakfire already busy' =3D> 'Pakfire is already performing a task. Please tr=
y again later.',
 'pakfire available addons' =3D> 'Available Addons:',
 'pakfire configuration' =3D> 'Pakfire Configuration',
 'pakfire core update auto' =3D> 'Install core and addon updates automaticall=
y:',
--=20
2.27.0.windows.1


--===============6433606393686986089==--