cryptomail: Fix stupid option name thing.

[cryptomail] / bin / cryptomail

diff --git a/bin/cryptomail b/bin/cryptomail
index 0c0ed94..27beea2 100755 (executable)
--- a/bin/cryptomail
+++ b/bin/cryptomail
@@ -404,7 +404,7 @@ def cmd_generate(argv):
       if c not in constraints:
         die("unknown constraint `%s'", c)
       map.setdefault(c, []).append(v)
-    elif o in ('f', '--format'):
+    elif o in ('-f', '--format'):
       format = a
     else:
       raise 'Barf!'
@@ -610,7 +610,9 @@ def main():
 
 try:
   main()
-except Exception:
+except SystemExit:
+  raise
+except:
   ty, exc, tb = exc_info()
   moan('unhandled %s exception' % ty.__name__)
   for file, line, func, text in TB.extract_tb(tb):