From patchwork Wed Mar 9 22:56:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 5331 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KDSJp0TxZz3xj2 for ; Wed, 9 Mar 2022 22:57:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KDSJm1sR5z5WG; Wed, 9 Mar 2022 22:57:44 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KDSJl4dtgz32KQ; Wed, 9 Mar 2022 22:57:43 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KDSJk0Wfcz2yj9 for ; Wed, 9 Mar 2022 22:57:42 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4KDSJj6f2Bz4jy for ; Wed, 9 Mar 2022 22:57:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 55270400B2 for ; Wed, 9 Mar 2022 23:57:38 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8ZhepynNiB2t for ; Wed, 9 Mar 2022 23:57:37 +0100 (CET) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id 689B61B97D; Wed, 9 Mar 2022 23:57:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1646866657; bh=symEP+kWrCkhX6xGdFzlSKzmqxnAlZZwTfNxu4wl5zk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fC41qRSU3rbNsFWCdTYuQRoXk+UxyvP/yfeXwmEgCoZ1wmYQKoKfrMrxM4bqj+NmV +rYl/jE7f8FDL9rzGDlYUGsn01J+jzLzxNqAYpjzbcvaDc378NZA+gvttP/UPqxIyu SmtoVBgf3K94eke+Mq6J63D0k7/jzoby3CHQcrwiIqsOhcW0stKDQoA4Xlaad37qgu +raByuIqZNkgSMGwrxd4NaWEJ6GU+cEZG5BjkRXmicGxAwLOpfpJyXi8i2EAMcYkyO o1gpR87mMfPa5i0Ahe33eLnc2IW0+idJ5U0+fyeaiV5S7Un1YvyMK6QbpN4UXEmAjq 9whw8kuLvcLyw== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 3/9] pakfire: Replace dbgetlist duplicate code Date: Wed, 9 Mar 2022 23:56:49 +0100 Message-Id: <20220309225655.4472-4-robin.roevens@disroot.org> In-Reply-To: <20220309225655.4472-1-robin.roevens@disroot.org> References: <20220309225655.4472-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-sicho-MailScanner-ID: 689B61B97D.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1647471431.69689@qauz+nXW53Shj2eL0nCS4w ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1646866661; a=rsa-sha256; cv=none; b=f8Pi3LrrsZ/o0fvGcgzCRr9p1l8GhaEbG+NTSCJ0emsPchhRq8Zr/rFnPw4AD5hSmOijW+ 16i+zeqBS27nRo0k2HYSPMTbfG/jAE5ZBiuC/FiisqaLjpgOZC/diJPx1qWO1g9IisF3Hz 4GVJ9R2skvuSevuJyHS1pCjtQMMX8EcOU0qMUB1l0hL1KPtGRF+1NjVF3R0zJvIRgQVrhW GGiAuK9lfxoteuVK3JPLMUuntufCq1TMO4Jm0OUo417c9gyyqAF6/qbYUigqgG918d2uV0 htBypoQYABa6vM/xwR06SU5tse/GgwsyUmE6xx69zd5iG2RVfuK/fQb6KLDISg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=fC41qRSU; dmarc=pass (policy=quarantine) header.from=disroot.org; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1646866661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=v07GAoKXQH0SSTfD1jb+mRJdifVOLADoW2iGQTHHr1E=; b=cZpnSRXBPDHodmqZ9kgJ8HqtAZw+urdIpfwhBbO5iLn7lhMiITAgxCRk7NE+8OU7Emc9gG DlMwooDHVEaN4V8UJ6lN8Ae7eZ/gpQvaTCOQ9vCqgNdhSX7OstVoNM18NbuJr8hfZYpRre aXP7oJlWb++J4ehB5oJHNieMnpFz/nuhtMi9EBLs4o7oCbSO9CuldYwDpi67uRDXupmqxE TEZb5fJSN8pOoJij13YJjfwXh+NoclRKWvxe3jT1839LTwHLyOpk3qAcAySOJ6NPTeK2Tz O/EqNFDo/CsaEPeVue1LNY5WjyuDwcXtuTd08i+cqT+AlRGHv30G0WRhz2JINw== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=fC41qRSU; dmarc=pass (policy=quarantine) header.from=disroot.org; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-4.82 / 11.00]; BAYES_HAM(-3.00)[99.99%]; IP_REPUTATION_HAM(-1.15)[asn: 50673(-0.33), country: NL(-0.01), ip: 178.21.23.139(-0.82)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-0.99)[-0.985]; SPF_REPUTATION_HAM(-0.68)[-0.67731916809959]; MV_CASE(0.50)[]; R_MISSING_CHARSET(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; R_SPF_ALLOW(-0.20)[+a:c]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[disroot.org:+]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4KDSJj6f2Bz4jy X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Replace dbgetlist code duplicating dblist and getmetafile workings with call to actual dblist and getmetafile functions. Signed-off-by: Robin Roevens --- src/pakfire/lib/functions.pl | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) 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; - open(FILE, "<$Conf::dbdir/lists/packages_list.db"); - my @db = ; - close(FILE); + my %paklist = &Pakfire::dblist("all"); opendir(DIR,"$Conf::dbdir/meta"); my @files = readdir(DIR); @@ -415,13 +413,9 @@ sub dbgetlist { next if ( $file =~ /^old/ ); %metadata = parsemetafile("$Conf::dbdir/meta/$file"); - foreach $prog (@db) { - @templine = 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{'Name'}\"}{'Release'}" ne "$metadata{'Release'}")) { + move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}"); + getmetafile($metadata{'Name'}); } } }