mirror of https://github.com/borgbase/vorta
Handle OSError 6 when trying to read a socket in .ssh (#269)
Fixes #268
This commit is contained in:
parent
a83ad6352e
commit
33c16d925f
|
@ -1,4 +1,5 @@
|
||||||
import os
|
import os
|
||||||
|
import errno
|
||||||
import sys
|
import sys
|
||||||
import platform
|
import platform
|
||||||
import plistlib
|
import plistlib
|
||||||
|
@ -78,6 +79,12 @@ def get_private_keys():
|
||||||
available_private_keys.append(key_details)
|
available_private_keys.append(key_details)
|
||||||
except (SSHException, UnicodeDecodeError, IsADirectoryError):
|
except (SSHException, UnicodeDecodeError, IsADirectoryError):
|
||||||
continue
|
continue
|
||||||
|
except OSError as e:
|
||||||
|
if e.errno == errno.ENXIO:
|
||||||
|
# when key_file is a (ControlPath) socket
|
||||||
|
continue
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
return available_private_keys
|
return available_private_keys
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue