From mboxrd@z Thu Jan  1 00:00:00 1970
From: Robin Roevens <robin.roevens@disroot.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/9] pakfire: Replace duplicate code with dblist functioncall
Date: Wed, 09 Mar 2022 23:56:48 +0100
Message-ID: <20220309225655.4472-3-robin.roevens@disroot.org>
In-Reply-To: <20220309225655.4472-1-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5352057937174422675=="
List-Id: <development.lists.ipfire.org>

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

Replace pakfire install code duplicating dblist working with call
to actual dblist function.

Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
---
 src/pakfire/pakfire | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index b4930e85d..f23110cf5 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -107,42 +107,30 @@
 		### Make sure that the list is not outdated.
 		&Pakfire::dbgetlist("noforce");
=20
-		open(FILE, "<$Conf::dbdir/lists/packages_list.db");
-		my @db =3D <FILE>;
-		close(FILE);
+		my %paklist =3D &Pakfire::dblist("all");
=20
 		my $dep;
 		my @deps;
 		my $pak;
 		my @paks;
 		my @temp;
-		my @templine;
-		my $found =3D 0;
 		my $return;
 		my @all;
 		foreach $pak (@ARGV) {
 			unless ("$pak" =3D~ "^-") {
-				$return =3D &Pakfire::isinstalled($pak);
-				if ($return eq 0) {
-					&Pakfire::message("PAKFIRE INFO: $pak is already installed");
-					next;
-				}
-				$found =3D 0;
-				foreach (@db) {
-					@templine =3D split(/;/,$_);
-					if ("$templine[0]" eq "$pak" ) {
-						push(@paks,$pak);
-						push(@all,$pak);
-						@temp =3D &Pakfire::resolvedeps("$pak");
-						foreach $dep (@temp) {
-							push(@deps,$dep) if $dep;
-							push(@all,$dep) if $dep;
-						}
-						$found =3D 1;
-						break;
+				if (defined $paklist{$pak}) {
+					if ("$paklist{$pak}{'Installed'}" eq "yes") {
+						&Pakfire::message("PAKFIRE INFO: $pak is already installed");
+						next;
 					}
-				}
-				if ($found =3D=3D 0) {
+					push(@paks,$pak);
+					push(@all,$pak);
+					@temp =3D &Pakfire::resolvedeps("$pak");
+					foreach $dep (@temp) {
+						push(@deps,$dep) if $dep;
+						push(@all,$dep) if $dep;
+					}
+				} else {
 					&Pakfire::message("");
 					&Pakfire::message("PAKFIRE WARN: The pak \"$pak\" is not known. Please =
try running \"pakfire update\".");
 				}
--=20
2.34.1


--=20
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.


--===============5352057937174422675==--