From: Michael Fritch <mfritch@suse.com>
Date: Thu, 18 Feb 2021 22:25:27 +0000 (-0700)
Subject: cephadm: do not use bare 'except' (E722)
X-Git-Tag: v17.1.0~2749^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eb4c38f10251386b190194dd12f2787b083e383;p=ceph.git

cephadm: do not use bare 'except' (E722)

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index e5792d8d94ba..6185c75d38b5 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 32d09664ebe4..bed007711cdc 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,