Catch ValueError as well because of El Capitan provoking a bug in python2's subprocess

Fixes #14895
pull/13487/merge
Toshio Kuratomi 9 years ago
parent a61a3e28da
commit 2ba4428424

@ -275,8 +275,12 @@ class VaultEditor:
try: try:
r = call(['shred', tmp_path]) r = call(['shred', tmp_path])
except OSError: except (OSError, ValueError):
# shred is not available on this system, or some other error occured. # shred is not available on this system, or some other error occured.
# ValueError caught because OS X El Capitan is raising an
# exception big enough to hit a limit in python2-2.7.11 and below.
# Symptom is ValueError: insecure pickle when shred is not
# installed there.
r = 1 r = 1
if r != 0: if r != 0:

Loading…
Cancel
Save