From 4f555407279c078ef0f71571dcefaafa0faa0d3f Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Fri, 29 May 2020 16:04:20 +0200 Subject: [PATCH] qa/cephadm: FileNotFoundError doesn't exist in py2 Signed-off-by: Sebastian Wagner (cherry picked from commit eddb6354e157a653962e68d100c6881b5a0fdc24) --- qa/tasks/cephadm.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index e6cbf9e7037..60c666c81ab 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -6,6 +6,7 @@ from io import BytesIO import argparse import configobj import contextlib +import errno import logging import os import json @@ -1163,6 +1164,9 @@ def add_mirror_to_cluster(ctx, mirror): path=registries_conf, data=six.ensure_str(new_config), ) - except FileNotFoundError as e: + except IOError as e: # py3: use FileNotFoundError instead. + if e.errno != errno.ENOENT: + raise + # Docker doesn't ship a registries.conf log.info('Failed to add mirror: %s' % str(e)) -- 2.47.3