Rev 38: Simplify error handling. in http://people.samba.org/bzr/jelmer/bzr-cia/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-cia/trunk

------------------------------------------------------------
revno: 38
revision-id: jelmer at samba.org-20081010133553-im3s7i1roay3zj5x
parent: jelmer at samba.org-20081010132755-xr0vstawnini8hlb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-10-10 15:35:53 +0200
message:
  Simplify error handling.
=== modified file '__init__.py'
--- a/__init__.py	2008-10-10 13:27:55 +0000
+++ b/__init__.py	2008-10-10 13:35:53 +0000
@@ -96,7 +96,7 @@
         saxutils.escape(revision.message))
 
 
-def cache_message(revid, message):
+def store_failed_message(revid, message):
     from bzrlib.config import config_dir
     import os
     cache_dir = os.path.join(config_dir(), "cia")
@@ -133,9 +133,9 @@
     if not quiet:
         info("Submitting revision to CIA.")
     if not dry_run:
+        error = None
         try:
             xmlrpclib.ServerProxy(server).hub.deliver(msg)
-            error = None
         except xmlrpclib.ProtocolError, e:
             error = e.errmsg
         except socket.gaierror, (_, msg):