From 8eb4c38f10251386b190194dd12f2787b083e383 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Thu, 18 Feb 2021 15:25:27 -0700 Subject: [PATCH] cephadm: do not use bare 'except' (E722) Signed-off-by: Michael Fritch --- src/cephadm/cephadm | 2 +- src/cephadm/tox.ini | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index e5792d8d94b..6185c75d38b 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4056,7 +4056,7 @@ def registry_login(ctx: CephadmContext, url, username, password): out, _, _ = call_throws(ctx, cmd) if 'podman' in container_path: os.chmod('/etc/ceph/podman-auth.json', 0o600) - except: + except Exception: raise Error("Failed to login to custom registry @ %s as %s with given password" % (ctx.registry_url, ctx.registry_username)) ################################## diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini index 32d09664ebe..bed007711cd 100644 --- a/src/cephadm/tox.ini +++ b/src/cephadm/tox.ini @@ -6,7 +6,6 @@ skipsdist=true max-line-length = 100 ignore = E501, - E722, E741, F401, F841,