From nobody Fri Mar 29 11:15:38 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1565339742; cv=none; d=zoho.com; s=zohoarc; b=aCjX6SXIwuKy2mKKzgPIUzZYosGFSRQzPV4Z7lxjRQt9lOAa8nySL0nkQbsJhLH8I96kNuExzMgQa84Kej3Q4i7ePsiiXX8nf2gV9YHskcd5z+f1+c4PvS4IvWOazbjy1uMu9/rNYTZz8wQlC2gToTlAjGHmWWYsNV8cL1OJmew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565339742; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Y0sY2nEpQY7wq87lksRT1g3tMBlD1543uf9zYsOqyA4=; b=J2csBfuUmE+GnLqkJ2EhMr7UJGMR2A3cvcFUipcTMwC9L1UMFuLAnEScPxZ3cdxd3jMrajj+ftuPRD6vFxWQk8AqSMh2KaOIUknxCAcEKc/us0XcUSWeV8FyRK7rz7q09TbgfmPrHFr7NCRP8DgEY1XEgoSlMRdmzP2+ag/f/ew= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565339742494567.3264047377742; Fri, 9 Aug 2019 01:35:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 895D6314253B; Fri, 9 Aug 2019 08:35:40 +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 1E16F6CE47; Fri, 9 Aug 2019 08:35:40 +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 3C9552551E; Fri, 9 Aug 2019 08:35:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x798Zbl1012183 for ; Fri, 9 Aug 2019 04:35:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id AC18426181; Fri, 9 Aug 2019 08:35:37 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 373CA26195 for ; Fri, 9 Aug 2019 08:35:37 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 9 Aug 2019 10:35:24 +0200 Message-Id: <20190809083527.12778-2-abologna@redhat.com> In-Reply-To: <20190809083527.12778-1-abologna@redhat.com> References: <20190809083527.12778-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 1/4] refresh: Get rid of self.project_name 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-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 09 Aug 2019 08:35:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We don't need to access it from anywhere else, so it can be a local variable instead of an object property. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- refresh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/refresh b/refresh index 8f99042..89c2818 100755 --- a/refresh +++ b/refresh @@ -64,11 +64,12 @@ class Dockerfile: stem =3D path.stem[len(Dockerfile.PREFIX):] =20 self.projects =3D [] + project_name =3D None =20 for project in Dockerfile.PROJECTS: if stem.rfind(project + "-") >=3D 0: - self.project_name =3D project - stem =3D stem[len(self.project_name) + 1:] + project_name =3D project + stem =3D stem[len(project_name) + 1:] for subproject in Dockerfile.PROJECTS[project]: self.projects +=3D [subproject] break @@ -97,7 +98,7 @@ class Dockerfile: if self.os =3D=3D "fedora-rawhide": mingw_projects =3D [] for subproject in self.projects: - if Dockerfile.PROJECTS[self.project_name][subproject]: + if Dockerfile.PROJECTS[project_name][subproject]: mingw_projects +=3D [subproject + "+mingw*"] =20 self.projects +=3D mingw_projects --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 11:15:38 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1565339742; cv=none; d=zoho.com; s=zohoarc; b=QVtwiQw8yJ7HkvGvx5jep0SM6jamPTTRlLjZyTckwqFUaCaW2bPdhnGrgKpbFfYaPcs3UfTB93175tMW33bd6iucfiKMsX8ntGilAvX4cl9968OdQznHJBpSHdORsISTAfl67lk94z8RoWCwqWqJTJb05VfVujbPPbYvJGKj1NE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565339742; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=YeLWfkeEKyO+cJOg1sTa2XwdfOusG6n5BgQrZwnHzjU=; b=NFKoIRHT/LumiLh1pqOgWoDXbDxhSZOSdJGxb3dCkf9MU5Rx2Td7lnzyz9HwaVxd2kBWKPFHipvSFESs2wk9tIMfsKjeQofEXyh6w9PhmclU6VFipQPYHHlFQ9GY8UvLFpBGxfFTDPuu/vaAXsOWVNLnYTBf8n5lBQKBm21wZRI= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565339742646718.7510777650972; Fri, 9 Aug 2019 01:35:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C2BA30031F3; Fri, 9 Aug 2019 08:35:41 +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 2C08F60FA1; Fri, 9 Aug 2019 08:35:40 +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 F18B02551C; Fri, 9 Aug 2019 08:35:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x798ZcM5012191 for ; Fri, 9 Aug 2019 04:35:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7929826186; Fri, 9 Aug 2019 08:35:38 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0445D26181 for ; Fri, 9 Aug 2019 08:35:37 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 9 Aug 2019 10:35:25 +0200 Message-Id: <20190809083527.12778-3-abologna@redhat.com> In-Reply-To: <20190809083527.12778-1-abologna@redhat.com> References: <20190809083527.12778-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 2/4] refresh: Improve project handling 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-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 09 Aug 2019 08:35:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Instead of adding native projects first and then coming back to add MinGW projects at a later time, add all projects in a single step. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- refresh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/refresh b/refresh index 89c2818..b26a9f3 100755 --- a/refresh +++ b/refresh @@ -63,18 +63,15 @@ class Dockerfile: self.path =3D path stem =3D path.stem[len(Dockerfile.PREFIX):] =20 - self.projects =3D [] project_name =3D None =20 for project in Dockerfile.PROJECTS: if stem.rfind(project + "-") >=3D 0: project_name =3D project stem =3D stem[len(project_name) + 1:] - for subproject in Dockerfile.PROJECTS[project]: - self.projects +=3D [subproject] break =20 - if self.projects =3D=3D []: + if not project_name: raise Exception("File '{}' does not have any matching " "project.".format(path)) =20 @@ -93,15 +90,16 @@ class Dockerfile: self.os =3D stem self.cross_arch =3D None =20 - # Fedora Rawhide is special in that we use it to perform MinGW - # builds, so we need to add the corresponding projects - if self.os =3D=3D "fedora-rawhide": - mingw_projects =3D [] - for subproject in self.projects: - if Dockerfile.PROJECTS[project_name][subproject]: - mingw_projects +=3D [subproject + "+mingw*"] + self.projects =3D [] + + for project in Dockerfile.PROJECTS[project_name]: + self.projects +=3D [project] + # Fedora Rawhide is special in that we use it to perform MinGW + # builds, so we need to add the corresponding projects + if (self.os =3D=3D "fedora-rawhide" and + Dockerfile.PROJECTS[project_name][project]): + self.projects +=3D [project + "+mingw*"] =20 - self.projects +=3D mingw_projects =20 def refresh(self, lcitool): =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 11:15:38 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1565339756; cv=none; d=zoho.com; s=zohoarc; b=YQn5f+1roKalfMCWj9mzkFUp5NmmrcMBreYa5WlYO9AM0/tF6IzIl+tYTmsW/UtxCyr6npgb03tVRRXyM1c/hcjL03+RgwQFlo0JfrieNHu1MwQos7uSdscorU4sJiFst7tH+TMEhmzLbgddq3zrLtoXyOMJwrD8PfDQGSCoLBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565339756; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=HChm1MDzEMgBJKKCDc29C2QQFgKjE+Y0f8FllI8Qr+o=; b=HWxcOgTy8qT6kX4BLnsZPXzT2EMqvZ3QhKRO4qAdXaR9qzzy0rkRmEaUsfE4btgQFYWaI1tw+T8SGkou7xoGsz6ozTVKcmeirSx7VZ7jbbqdaeJoPThI0mulvQkqDFiEmvfDLr7bvbjJElEBdnrRHyZt+PE7OBtLvIoitGURjkM= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565339756247177.78947046839085; Fri, 9 Aug 2019 01:35:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F8F63174654; Fri, 9 Aug 2019 08:35:54 +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 362DA1001DE4; Fri, 9 Aug 2019 08:35:54 +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 E3E3E180124D; Fri, 9 Aug 2019 08:35:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x798Zd9S012199 for ; Fri, 9 Aug 2019 04:35:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 466DC26186; Fri, 9 Aug 2019 08:35:39 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C561D26181 for ; Fri, 9 Aug 2019 08:35:38 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 9 Aug 2019 10:35:26 +0200 Message-Id: <20190809083527.12778-4-abologna@redhat.com> In-Reply-To: <20190809083527.12778-1-abologna@redhat.com> References: <20190809083527.12778-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 3/4] refresh: Look for project with startswith() 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-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 09 Aug 2019 08:35:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Using rfind() makes sense when we're looking for CROSS, since we don't know exactly where it will be, but when looking for the project we know it will be at the very beginning of the string so we should check accordingly. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- refresh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/refresh b/refresh index b26a9f3..f89b836 100755 --- a/refresh +++ b/refresh @@ -66,9 +66,9 @@ class Dockerfile: project_name =3D None =20 for project in Dockerfile.PROJECTS: - if stem.rfind(project + "-") >=3D 0: + if stem.startswith(project + "-"): + stem =3D stem[len(project) + 1:] project_name =3D project - stem =3D stem[len(project_name) + 1:] break =20 if not project_name: --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Mar 29 11:15:38 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1565339757; cv=none; d=zoho.com; s=zohoarc; b=mtMgKxgV0el6rEZ+mJlK7EKPOLAywgmGNtste2vXZabFXPBNoM6YrOvgOT3aPMOFqzvdYEuR6Z3QQKL1hZ73EieE32WypPNY5vPO2+2kWpsNgSXtPBYD/BtTzS4aJxQBupayyf8W2uFAmQ3lqp6v7Axjh/7wM1EY+Cv9w4b7fpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565339757; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Etq36/gd1mpq5igPHYicCH4yby4VCRjK4JDt5QNDI8Q=; b=FpMaJ2BV75ZfgUis/V/vwDnaKVBub0G6y7tWSPwFjlUNcUpEPcD564uU9UNKtEeN9p1wALS10ObYus9B8s7+bXTUK6AZdBuFaHfW8XenhdjxKo8LEYTqZ+16rtC0fRfNwVuolmOIo2Cu50BOf39d9JGJx4xTDFhVe3JrBc4ePsc= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565339757331290.5801057198697; Fri, 9 Aug 2019 01:35:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2243776521; Fri, 9 Aug 2019 08:35:55 +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 E879F1001DD7; Fri, 9 Aug 2019 08:35:54 +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 A2BF7180124D; Fri, 9 Aug 2019 08:35:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x798ZeWC012213 for ; Fri, 9 Aug 2019 04:35:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 14D6026181; Fri, 9 Aug 2019 08:35:40 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9392F26195 for ; Fri, 9 Aug 2019 08:35:39 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 9 Aug 2019 10:35:27 +0200 Message-Id: <20190809083527.12778-5-abologna@redhat.com> In-Reply-To: <20190809083527.12778-1-abologna@redhat.com> References: <20190809083527.12778-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 4/4] refresh: Update comments 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-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 09 Aug 2019 08:35:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This reverts some of the changes made by 7130ffe0a0e9, which is okay because they were not entirely accurate: by the time we start looking for CROSS, we have already removed the project name from the stem, so the OS name is indeed the first thing you'll find there. Signed-off-by: Andrea Bolognani Reviewed-by: Fabiano Fid=C3=AAncio --- refresh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/refresh b/refresh index f89b836..6cefd79 100755 --- a/refresh +++ b/refresh @@ -65,6 +65,8 @@ class Dockerfile: =20 project_name =3D None =20 + # Now that we've removed the prefix, we expect to find the name + # of one of the known projects, followed by a dash for project in Dockerfile.PROJECTS: if stem.startswith(project + "-"): stem =3D stem[len(project) + 1:] @@ -78,15 +80,14 @@ class Dockerfile: cross =3D stem.rfind(Dockerfile.CROSS) =20 if cross >=3D 0: - # If we found CROSS, then everything in between the project's - # name and the cross is the name of the OS and everything after - # it the name of the architecture we're targeting for - # cross-compilation + # If we found CROSS, then everything before it is the name of + # the OS and everything after it the name of the architecture + # we're targeting for cross-compilation self.os =3D stem[:cross] self.cross_arch =3D stem[cross + len(Dockerfile.CROSS):] else: - # Otherwise the name of the OS starts just after the project's - # name and there is no cross-compilation architecture + # Otherwise the entire stem is the name of the OS and there + # is no cross-compilation architecture self.os =3D stem self.cross_arch =3D None =20 @@ -95,7 +96,9 @@ class Dockerfile: for project in Dockerfile.PROJECTS[project_name]: self.projects +=3D [project] # Fedora Rawhide is special in that we use it to perform MinGW - # builds, so we need to add the corresponding projects + # builds, so we need to add the corresponding projects as well. + # If a specific project needs to have the MinGW variant includ= ed, + # the corresponding value in the dictionary will be True if (self.os =3D=3D "fedora-rawhide" and Dockerfile.PROJECTS[project_name][project]): self.projects +=3D [project + "+mingw*"] --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list