From nobody Tue May 7 11:18:57 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552657772268210.2173547239205; Fri, 15 Mar 2019 06:49:32 -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 53CE8C057F34; Fri, 15 Mar 2019 13:49:30 +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 1F92960BE6; Fri, 15 Mar 2019 13:49:30 +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 2CF7B181A138; Fri, 15 Mar 2019 13:49:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FDnSDB014713 for ; Fri, 15 Mar 2019 09:49:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3FB875D717; Fri, 15 Mar 2019 13:49:28 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B83735D704 for ; Fri, 15 Mar 2019 13:49:27 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 14:49:20 +0100 Message-Id: <20190315134922.24726-2-abologna@redhat.com> In-Reply-To: <20190315134922.24726-1-abologna@redhat.com> References: <20190315134922.24726-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 1/3] refresh: Remove double space 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.32]); Fri, 15 Mar 2019 13:49:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" flake8 complains about it. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refresh b/refresh index 1e6c185..730bb7c 100755 --- a/refresh +++ b/refresh @@ -35,7 +35,7 @@ class MoveAlongException(Exception): class Dockerfile: =20 PREFIX =3D "buildenv-" - CROSS =3D "-cross-" + CROSS =3D "-cross-" SUFFIX =3D ".Dockerfile" =20 def __init__(self, path): --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 11:18:57 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552657780802432.40256415403076; Fri, 15 Mar 2019 06:49:40 -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 35A9E3007C3E; Fri, 15 Mar 2019 13:49:39 +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 0C1A460FDC; Fri, 15 Mar 2019 13:49:39 +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 C5FE641F3C; Fri, 15 Mar 2019 13:49:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FDnTWw014720 for ; Fri, 15 Mar 2019 09:49:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 172225D717; Fri, 15 Mar 2019 13:49:29 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8FB925D704 for ; Fri, 15 Mar 2019 13:49:28 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 14:49:21 +0100 Message-Id: <20190315134922.24726-3-abologna@redhat.com> In-Reply-To: <20190315134922.24726-1-abologna@redhat.com> References: <20190315134922.24726-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 2/3] refresh: Drop Error class 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.40]); Fri, 15 Mar 2019 13:49:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Turns out we can use the built-in Exception class directly. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- refresh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/refresh b/refresh index 730bb7c..1b94736 100755 --- a/refresh +++ b/refresh @@ -21,13 +21,6 @@ import subprocess import sys =20 =20 -class Error(Exception): - - def __init__(self, message): - super(Error, self).__init__() - self.message =3D message - - class MoveAlongException(Exception): pass =20 @@ -47,7 +40,7 @@ class Dockerfile: =20 # Files that don't follow the expected format should be reported if not path.stem.startswith(Dockerfile.PREFIX): - raise Error("Invalid name '{}'".format(path.stem)) + raise Exception("Invalid name '{}'".format(path.stem)) =20 self.path =3D path stem =3D path.stem[len(Dockerfile.PREFIX):] @@ -94,7 +87,7 @@ class Dockerfile: rc =3D subprocess.run(args, capture_output=3DTrue) =20 if rc.returncode !=3D 0: - raise Error("lcitool failed: {}".format(rc.stderr.decode())) + raise Exception("lcitool failed: {}".format(rc.stderr.decode()= )) =20 with self.path.open('w') as f: print(rc.stdout.decode().strip(), file=3Df) @@ -120,7 +113,7 @@ class Application: self.lcitool =3D ci_repo.joinpath("guests").joinpath("lcitool") =20 if not self.lcitool.exists(): - raise Error("{} does not exist".format(self.lcitool)) + raise Exception("{} does not exist".format(self.lcitool)) =20 def run(self): =20 @@ -137,6 +130,6 @@ class Application: if __name__ =3D=3D "__main__": try: Application().run() - except Error as err: - sys.stderr.write("{}: {}\n".format(sys.argv[0], err.message)) + except Exception as ex: + sys.stderr.write("{}: {}\n".format(sys.argv[0], ex)) sys.exit(1) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue May 7 11:18:57 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15526577739871009.4681417987047; Fri, 15 Mar 2019 06:49:33 -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 580ED3092648; Fri, 15 Mar 2019 13:49:32 +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 2B10C1001DC9; Fri, 15 Mar 2019 13:49:32 +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 E3B43181A13D; Fri, 15 Mar 2019 13:49:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2FDnT2a014728 for ; Fri, 15 Mar 2019 09:49:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id E39A85D717; Fri, 15 Mar 2019 13:49:29 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 682615D704 for ; Fri, 15 Mar 2019 13:49:29 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 15 Mar 2019 14:49:22 +0100 Message-Id: <20190315134922.24726-4-abologna@redhat.com> In-Reply-To: <20190315134922.24726-1-abologna@redhat.com> References: <20190315134922.24726-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [dockerfiles PATCH 3/3] refresh: Move exception handling to Application.run() 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.43]); Fri, 15 Mar 2019 13:49:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This commit is best viewed with 'git show -w'. Signed-off-by: Andrea Bolognani Reviewed-by: Erik Skultety --- refresh | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/refresh b/refresh index 1b94736..1db0fc8 100755 --- a/refresh +++ b/refresh @@ -117,19 +117,20 @@ class Application: =20 def run(self): =20 - for item in self.here.iterdir(): - try: - dockerfile =3D Dockerfile(item) - except MoveAlongException: - continue + try: + for item in self.here.iterdir(): + try: + dockerfile =3D Dockerfile(item) + except MoveAlongException: + continue =20 - print(item.stem + item.suffix) - dockerfile.refresh(self.lcitool) + print(item.stem + item.suffix) + dockerfile.refresh(self.lcitool) + + except Exception as ex: + sys.stderr.write("{}: {}\n".format(sys.argv[0], ex)) + sys.exit(1) =20 =20 if __name__ =3D=3D "__main__": - try: - Application().run() - except Exception as ex: - sys.stderr.write("{}: {}\n".format(sys.argv[0], ex)) - sys.exit(1) + Application().run() --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list