From nobody Mon Feb 9 16:17:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1581355122899976.2221521568018; Mon, 10 Feb 2020 09:18:42 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-eoAKvSFuMNuv0W_6DmIScg-1; Mon, 10 Feb 2020 12:18:33 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 269A4800D48; Mon, 10 Feb 2020 17:18:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F204F84D8A; Mon, 10 Feb 2020 17:18:27 +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 9003E18089CD; Mon, 10 Feb 2020 17:18:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01AHIOo3028010 for ; Mon, 10 Feb 2020 12:18:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 902EB5C28F; Mon, 10 Feb 2020 17:18:24 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.43.2.246]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18CA95C21B for ; Mon, 10 Feb 2020 17:18:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581355121; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6HgCGMetBNkeCuM9DQ32LYBlaUjfk6b6DjJ6ISfLDf4=; b=EaN6PU4MM1hujx2klmpRog4gExYr23DZRV/o28K8gbjpN4nmbHayhxR0TMLf45aiOEi0+c 12kZhzV8LlK96/l7sDBvfDnVjVJEJUEoTDEHKj0BOGmpKTqz7SO3T2pYU3y6oZwHkC4DBa N04NxlmAizeQcmzniWbiIMSAMq84gbs= From: Andrea Bolognani To: libvir-list@redhat.com Subject: [jenkins-ci PATCH 2/8] lcitool: Change check for pip_pkgs formatting Date: Mon, 10 Feb 2020 18:18:11 +0100 Message-Id: <20200210171817.53126-3-abologna@redhat.com> In-Reply-To: <20200210171817.53126-1-abologna@redhat.com> References: <20200210171817.53126-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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: , 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-MC-Unique: eoAKvSFuMNuv0W_6DmIScg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Andrea Bolognani --- guests/lcitool | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 6624887..80a0d6a 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -725,7 +725,9 @@ class Application: varmap =3D {} varmap["package_manager"] =3D package_manager varmap["pkgs"] =3D pkg_align[1:] + pkg_align.join(sorted(set(pkgs.= values()))) - varmap["pip_pkgs"] =3D pip_pkg_align[1:] + pip_pkg_align.join(sort= ed(set(pip_pkgs.values()))) + + if pip_pkgs: + varmap["pip_pkgs"] =3D pip_pkg_align[1:] + pip_pkg_align.join(= sorted(set(pip_pkgs.values()))) =20 if package_format =3D=3D "deb": if cross_arch: @@ -823,7 +825,7 @@ class Application: =20 sys.stdout.write(script.format(**varmap)) =20 - if pip_pkgs: + if "pip_pkgs" in varmap: sys.stdout.write(textwrap.dedent(""" RUN pip3 install {pip_pkgs} """).format(**varmap)) --=20 2.24.1