]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
ceph-volume: python2 raises OSError on Popen with missing binary.
authorJan Fajerski <jfajerski@suse.com>
Fri, 22 Nov 2019 14:51:00 +0000 (15:51 +0100)
committerJan Fajerski <jfajerski@suse.com>
Fri, 22 Nov 2019 14:51:00 +0000 (15:51 +0100)
For compatibility alias FileNotFoundError to OSError.

Fixes: 72b79f71fa84fe0d56b2fd1745f5bb130380cc38
Fixes: https://tracker.ceph.com/issues/42967
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
src/ceph-volume/ceph_volume/util/system.py

index 100bcd7b0d25d47ba587e9434df1e32f588bb3e2..5aaca59af7557f4310ce936c6917d28cff2312a8 100644 (file)
@@ -8,6 +8,12 @@ import uuid
 from ceph_volume import process, terminal
 from . import as_string
 
+# python2 has no FileNotFoundError
+try:
+    FileNotFoundError
+except NameError:
+    FileNotFoundError = OSError
+
 logger = logging.getLogger(__name__)
 mlogger = terminal.MultiLogger(__name__)