From nobody Mon Feb 9 02:12:10 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 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 --- 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