From nobody Sun Feb 8 09:30:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551178881343196.69881340023483; Tue, 26 Feb 2019 03:01:21 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 079FE3086268; Tue, 26 Feb 2019 11:01:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BDE55600C0; Tue, 26 Feb 2019 11:01:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6733E3FB12; Tue, 26 Feb 2019 11:01:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x1QB0v1C029729 for ; Tue, 26 Feb 2019 06:00:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id D591760CAC; Tue, 26 Feb 2019 11:00:57 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-70.ams2.redhat.com [10.36.112.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 912FD60BFB; Tue, 26 Feb 2019 11:00:56 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 26 Feb 2019 11:00:44 +0000 Message-Id: <20190226110046.13145-4-berrange@redhat.com> In-Reply-To: <20190226110046.13145-1-berrange@redhat.com> References: <20190226110046.13145-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [jenkins-ci PATCH v5 3/5] lcitool: avoid intermediate list of packages X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 26 Feb 2019 11:01:19 +0000 (UTC) We can purge any packages which expand to None straight away, and simply convert to a set to get rid of duplicates. Reviewed-by: Andrea Bolognani Signed-off-by: Daniel P. Berrang=C3=A9 --- guests/lcitool | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 46af92b..88bc945 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -539,8 +539,7 @@ class Application: ) ) =20 - temp =3D {} - + pkgs =3D {} keys =3D ["default", package_format, os_name, os_full] # We need to add the base project manually here: the standard # machinery hides it because it's an implementation detail @@ -548,21 +547,17 @@ class Application: for package in self._projects.get_packages(project): for key in keys: if key in mappings[package]: - temp[package] =3D mappings[package][key] + pkgs[package] =3D mappings[package][key] =20 - pkgs =3D [] - for item in temp: - pkgname =3D temp[item] - if pkgname is None: - continue - if pkgname in pkgs: - continue - pkgs.append(pkgname) + if package not in pkgs: + continue + if pkgs[package] is None: + del pkgs[package] =20 print("FROM {}".format(facts["docker_base"])) =20 varmap =3D {} - varmap["pkgs"] =3D " \\\n ".join(sorted(pkgs)) + varmap["pkgs"] =3D " \\\n ".join(sorted(set(pkgs.values= ()))) if package_format =3D=3D "deb": sys.stdout.write(textwrap.dedent(""" RUN export DEBIAN_FRONTEND=3Dnoninteractive && \\ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list