[Nym3-commit] r410 - trunk/nymbaron/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-11-16 20:48:33 +0100 (Wed, 16 Nov 2005)
New Revision: 410

Modified:
   trunk/nymbaron/Client/Main.py
Log:
- Catch unprocessed Exceptions


Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-11-16 19:37:26 UTC (rev 409)
+++ trunk/nymbaron/Client/Main.py	2005-11-16 19:48:33 UTC (rev 410)
@@ -699,8 +699,12 @@
     output_f = sys.stdout
     secring = decode_secring(config, ui)
     mbox = account.get_mbox()[0]
-    args = decode_message_references(args, ['mbox'],
+    try:
+	args = decode_message_references(args, ['mbox'],
 	        {'mbox': (build_mbox_index, (account,))})
+    except DecodeException, inst:
+	ui.display(str(inst))
+	sys.exit(1)
     if output != None:
 	try:
 	    output_f = open(output, "w")
@@ -726,8 +730,12 @@
 def ldelete(ui, config, nickname, args = []):
     account = get_account_from_nickname(ui, config, nickname,
 	    "No nickname given, abort\nUse -n <nickname>")
-    mids = decode_message_references(args, ['mbox'],
+    try:
+	mids = decode_message_references(args, ['mbox'],
 	        {'mbox': (build_mbox_index, (account,))})
+    except DecodeException, inst:
+	ui.display(str(inst))
+	sys.exit(1)
     if len(mids) == 0:
 	ui.display("No valid message reference given, doing nothing")
 	return
@@ -738,8 +746,12 @@
     account = get_account_from_nickname(ui, config, nickname,
 	    "No nickname given, abort\nUse -n <nickname>")
     secring = decode_secring(config, ui)
-    mids = decode_message_references(args, ['syn'],
+    try:
+	mids = decode_message_references(args, ['syn'],
 	        {'syn': (build_syn_index, (secring, account))})
+    except DecodeException, inst:
+	ui.display(str(inst))
+	sys.exit(1)
     #if mids is empty, do nothing
     if len(mids) == 0:
 	ui.display("No valid syn reference given, doing nothing")
@@ -751,8 +763,12 @@
     account = get_account_from_nickname(ui, config, nickname,
 	    "No nickname given, abort\nUse -n <nickname>")
     secring = decode_secring(config, ui)
-    seqnos = decode_message_references(args, ['journal'],
+    try:
+	seqnos = decode_message_references(args, ['journal'],
 	        {'journal': (build_journal_index, (secring, account))})
+    except DecodeException, inst:
+	ui.display(str(inst))
+	sys.exit(1)
     if len(seqnos) == 0:
 	ui.display("No valid journal reference given, doing nothing")
 	return