From 40b16f0c70eee219206c99224088c3e81fed4d8a Mon Sep 17 00:00:00 2001
Message-Id: <40b16f0c70eee219206c99224088c3e81fed4d8a.1715986618.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 24 May 2015 10:53:27 +0100
Subject: [PATCH] pwsafe: Don't produce a backtrace on decryption failure.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 pwsafe | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 --------------------------------------------------
-- 
[mdw]