From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 24 May 2015 09:53:27 +0000 (+0100)
Subject: pwsafe: Don't produce a backtrace on decryption failure.
X-Git-Tag: 1.1.0~22
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/commitdiff_plain/40b16f0c70eee219206c99224088c3e81fed4d8a?hp=61cc9665df69b0641bfd40da285acbea20c48654

pwsafe: Don't produce a backtrace on decryption failure.
---

diff --git a/pwsafe b/pwsafe
index 91684c7..043db43 100644
--- a/pwsafe
+++ b/pwsafe
@@ -276,8 +276,11 @@ if argv[0] in commands:
   argv = argv[1:]
 else:
   c = 'find'
-if commands[c][0](argv):
-  print >>stderr, 'Usage: %s %s %s' % (prog, c, commands[c][1])
-  exit(1)
+try:
+  if commands[c][0](argv):
+    print >>stderr, 'Usage: %s %s %s' % (prog, c, commands[c][1])
+    exit(1)
+except DecryptError:
+  die("decryption failure")
 
 ###----- That's all, folks --------------------------------------------------