if len(av) < 2:
pp = C.getpass("Enter passphrase `%s': " % tag)
vpp = C.getpass("Confirm passphrase `%s': " % tag)
- if pp != vpp: raise ValueError, "passphrases don't match"
+ if pp != vpp: die("passphrases don't match")
elif av[1] == '-':
pp = stdin.readline()
else: