From patchwork Thu Jul 28 11:21:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 5768 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4LtpCX37Tfz3wvM for ; Thu, 28 Jul 2022 11:22:32 +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 4LtpCS47r1zq1; Thu, 28 Jul 2022 11:22:28 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4LtpCS3M4Rz303Y; Thu, 28 Jul 2022 11:22:28 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4LtpCR53pyz2xPh for ; Thu, 28 Jul 2022 11:22:27 +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 4LtpCQ4YF4zxZ for ; Thu, 28 Jul 2022 11:22:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B54C540DA4 for ; Thu, 28 Jul 2022 13:22:25 +0200 (CEST) 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 u4ilLUQhnPC2 for ; Thu, 28 Jul 2022 13:22:24 +0200 (CEST) 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 30EB4560AA; Thu, 28 Jul 2022 13:21:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1659007340; bh=o2JIs3reAY1FkfsE5lRDYfwwACr/Z3O2RPyKukkE2XA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Dk4BtOWcGdZN1cHdt2BKW3zwqeXXXt6Pl7VS3k0mKC4V0lWXUFNw0Hp0PQxyHHlFb FYPbTLwCGk4HOLHb4zrpK6lSNcqpPnhGkK0ZolPUjtwvMNKSohbgxXCIU+6tsF5lWt /Jx4kHDX/a4vbIRYyGC/fV3tyDjt5b+0cVvusaEZF92+u42C1VcUo5boCFm9cQ0ohe xDilSuHiSBwL+5PpESfDA5fMem1KDl94MPll9QGovjDPUrejnNZz23Mi/kl9/pKtP+ 8Gyzt0Mpm6095X5ihbYMzDzOz8HeyrTZYO+FRScOD06ZqyC/64XIqU3Pxo+0HI+Dnd PneRzSbv2T9zg== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH v2 04/10] pakfire: Replace dbgetlist duplicate code Date: Thu, 28 Jul 2022 13:21:30 +0200 Message-Id: <20220728112136.30218-5-robin.roevens@disroot.org> In-Reply-To: <20220728112136.30218-1-robin.roevens@disroot.org> References: <20220728112136.30218-1-robin.roevens@disroot.org> Mime-Version: 1.0 X-sicho-MailScanner-ID: 30EB4560AA.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1659612114.74873@RZXGxqxxHt78JkF77uTWEA ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1659007346; 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=V7y9ONW8RcW+9O5VxQjqvNP3n7Rkn/S4V/vvBkVpNH4=; b=oKHj6cebTEsjc/PY/WMw2KQEp8J2pSIHNSi7dcdP1kBsJv7qEpQvfXhlLNUmBb3dRztttd JIWCnhe5AJBOPhHCDXT0KUN2TW40OIbfzU9Bp5revbx93rMgrFqPS3YsmISHOHIbZuTmMC od/Yn4/wwLcCea03UuoNiM3EzopLpf+iRsBO2xDJrOIVY9DPkHOyWGJMOzcJE9Q+Vn0kGG LaC/VXGEzbwEOF+XEqEO219Adc8yonL5OUgchF7SAFicN8561MGYT5jWQimfCPFjItFs++ rhZurIpPUGwrXObfcrTnMbplESWAFFHmzR3w0LK7AKqam+wGvT2KEKkOIb3xkg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=Dk4BtOWc; 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-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1659007346; a=rsa-sha256; cv=none; b=EmJIIiPWA3mOdEMhdcbzdRyjs7IL7WApMVfB0CH8IL6FpyYKpHQd5nDQfvM0dUdiIETfKJ Ht7Oy6D3JJqifCOuiLvE8eXf9CeMRIUhDa3xLIaR3ADuffbxbvTD9P7s3JV0BHVFQG7saJ cIHZbtdtcOGaOTq6vl0Xk4PISYO6bM4d4cocXJFG7XuJzlYYEHROotvsRuq237C+YInA1U tRJJcLXgYwPEI/hbNWdoa4EckYvxKA4ZbrOIxisA2Ups+G0EilBcc0zcg2Z/2ICiFFJS/s rvITr4N05MQ122YlH1yF2lboR2O1RsJ+DuE1RFVLkta+z/9/THz4RLDuGrySog== X-Rspamd-Queue-Id: 4LtpCQ4YF4zxZ Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=Dk4BtOWc; 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 [-3.84 / 11.00]; BAYES_HAM(-3.00)[99.99%]; NEURAL_HAM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; SPF_REPUTATION_HAM(-0.82)[-0.81830489729047]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; MV_CASE(0.50)[]; R_MISSING_CHARSET(0.50)[]; R_SPF_ALLOW(-0.20)[+a]; R_DKIM_ALLOW(-0.20)[disroot.org:s=mail]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.01)[asn: 50673(0.00), country: NL(-0.01), ip: 178.21.23.139(0.00)]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; DKIM_TRACE(0.00)[disroot.org:+]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[] 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 | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 19160503e..971aa2d59 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -410,9 +410,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); @@ -424,12 +422,12 @@ 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'}"); - getmetafile($metadata{'Name'}); - } + if ((defined $paklist{"$metadata{'Name'}"}) && ( + ("$paklist{\"$metadata{'Name'}\"}{'Release'}" ne "$metadata{'Release'}") || + (defined $paklist{"$metadata{'Name'}"}{'AvailableRelease'})) + ) { + move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}"); + getmetafile($metadata{'Name'}); } } }