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

diff --git a/pwsafe b/pwsafe
index 91684c75faec4053cb81a954460f0c5f72d4ed24..043db433b9eb28cb17f7894140017caf170ee322 100644 (file)
--- a/pwsafe
+++ b/pwsafe
@@ -276,8 +276,11 @@ if argv[0] in commands:
   argv = argv[1:]
 else:
   c = 'find'
   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 --------------------------------------------------
 
 ###----- That's all, folks --------------------------------------------------