From 2f3f78d3053ba42c1a8e7196ab5fb378a8360a68 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Thu, 23 Mar 2006 19:58:53 +0000
Subject:  * Version bump  * Verbosity improvements

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1810 ce84e21b-d406-0410-9b95-82705330c041
---
 debian/changelog          | 6 ++++++
 misc/bcfg2.spec           | 2 +-
 src/lib/Client/Proxy.py   | 6 ++++--
 src/lib/Client/Toolset.py | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b1d5ddced..e16fc2a3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bcfg2 (0.8.2-0pre1) unstable; urgency=low
+
+  * new release
+
+ -- Narayan Desai <desai@mcs.anl.gov>  Thu,  23 Mar 2006 14:10:00 -0600
+
 bcfg2 (0.8.1-1) unstable; urgency=low
 
   * new release
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 91b354bba..b2d6a086d 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -1,5 +1,5 @@
 %define name bcfg2
-%define version 0.8.1
+%define version 0.8.2pre1
 %define release 1
 %define pythonversion 2.3
 
diff --git a/src/lib/Client/Proxy.py b/src/lib/Client/Proxy.py
index b019e5656..a809e70f8 100644
--- a/src/lib/Client/Proxy.py
+++ b/src/lib/Client/Proxy.py
@@ -47,10 +47,12 @@ class SafeProxy:
             except xmlrpclib.Fault:
                 self.log.debug("Operation %s completed with fault" % (method_name))
                 raise
-            except socket.error:
-                self.log.debug("Attempting %s (%d of %d) failed" % (method_name, (irs+1), self._retries))
+            except socket.error, serr:
+                self.log.debug("Attempting %s (%d of %d) failed because %s" % (method_name, (irs+1),
+                                                                               self._retries, serr))
                 time.sleep(0.5)                
             except:
+                self.log.error("Unknown failure", exc_info=1)
                 break
         raise xmlrpclib.Fault(20, 'Server Failure')
         
diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py
index 2c0bd693a..470395d5a 100644
--- a/src/lib/Client/Toolset.py
+++ b/src/lib/Client/Toolset.py
@@ -211,6 +211,7 @@ class Toolset(object):
                 self.states[entry] = method(entry)
         except:
             self.logger.error("Failure in VerifyEntry", exc_info=1)
+            self.logger.error("Entry: %s" % (lxml.etree.tostring(entry)))
 
     def InstallEntry(self, entry):
         '''Dispatch call to self.Install<tagname>'''
-- 
cgit v1.2.3-1-g7c22