Commit e8b5c8c1 authored by Robert Ricci's avatar Robert Ricci
Browse files

Fix for older versions of python

Use the older syntax for exception variables; older versions
of python (like 2.4, which is installed on boss and ops right
now), don't support the 'Except X as (Y,Z)' syntax.
parent e90a6e2a
......@@ -150,9 +150,9 @@ def PassPhraseCB(v, prompt1='Enter passphrase:', prompt2='Verify passphrase:'):
passphrase = open(PASSPHRASEFILE).readline()
passphrase = passphrase.strip()
return passphrase
except IOError as (errno, strerror):
except IOError, e:
print 'Error reading passphrase file %s: %s' % (PASSPHRASEFILE,
strerror)
e.strerror)
else:
if debug:
print 'passphrase file %s does not exist' % (PASSPHRASEFILE)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment