From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 3/9] pakfire: Replace dbgetlist duplicate code
Date: Mon, 21 Mar 2022 16:21:00 +0000
Message-ID: <0FFA20C5-B58C-4D53-AB63-F2BFDFA7B37D@ipfire.org>
In-Reply-To: <20220309225655.4472-4-robin.roevens@disroot.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2763580008316526095=="
List-Id: <development.lists.ipfire.org>

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

This looks okay, too.

> On 9 Mar 2022, at 22:56, Robin Roevens <robin.roevens(a)disroot.org> wrote:
>=20
> Replace dbgetlist code duplicating dblist and getmetafile
> workings with call to actual dblist and getmetafile functions.
>=20
> Signed-off-by: Robin Roevens <robin.roevens(a)disroot.org>
> ---
> src/pakfire/lib/functions.pl | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>=20
> diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
> index f08f43622..0caa4787e 100644
> --- a/src/pakfire/lib/functions.pl
> +++ b/src/pakfire/lib/functions.pl
> @@ -401,9 +401,7 @@ sub dbgetlist {
> 	my %metadata;
> 	my @templine;
>=20
> -	open(FILE, "<$Conf::dbdir/lists/packages_list.db");
> -	my @db =3D <FILE>;
> -	close(FILE);
> +    my %paklist =3D &Pakfire::dblist("all");
>=20
> 	opendir(DIR,"$Conf::dbdir/meta");
> 	my @files =3D readdir(DIR);
> @@ -415,13 +413,9 @@ sub dbgetlist {
> 		next if ( $file =3D~ /^old/ );
> 		%metadata =3D parsemetafile("$Conf::dbdir/meta/$file");
>=20
> -		foreach $prog (@db) {
> -			@templine =3D split(/\;/,$prog);
> -			if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" =
ne "$templine[2]")) {
> -				move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old=
_meta-$metadata{'Name'}");
> -				fetchfile("meta/meta-$metadata{'Name'}", "");
> -				move("$Conf::cachedir/meta-$metadata{'Name'}", "$Conf::dbdir/meta/meta=
-$metadata{'Name'}");
> -			}
> +		if ((defined $paklist{"$metadata{'Name'}"}) && ("$paklist{\"$metadata{'N=
ame'}\"}{'Release'}" ne "$metadata{'Release'}")) {
> +			move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_=
meta-$metadata{'Name'}");
> +			getmetafile($metadata{'Name'});
> 		}
> 	}
> }
> --=20
> 2.34.1
>=20
>=20
> --=20
> Dit bericht is gescanned op virussen en andere gevaarlijke
> inhoud door MailScanner en lijkt schoon te zijn.
>=20


--===============2763580008316526095==--