From bce56c6e02741171fd7c33169173cbf27ff9af4d Mon Sep 17 00:00:00 2001
From: Tom Parker <palfrey@tevp.net>
Date: Thu, 27 Sep 2007 15:50:40 +0200
Subject: [PATCH] dbusException fixes in PackageKit.frontend Move dbusException
 in class PackageKit, and drop the silly "wibble" printing for non-DBus
 exceptions

---
 python/packagekit/frontend.py | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/python/packagekit/frontend.py b/python/packagekit/frontend.py
index ceca90b2f..b8dc71776 100644
--- a/python/packagekit/frontend.py
+++ b/python/packagekit/frontend.py
@@ -55,24 +55,20 @@ class PackageKitTransactionFailure(PackageKitException):
 class PackageKitBackendFailure(PackageKitException):
 	pass
 
-def dbusException(func):
-	def wrapper(*args,**kwargs):
-		try:
-			return func(*args,**kwargs)
-		except dbus.exceptions.DBusException,e:
-			if e.get_dbus_name() == "org.freedesktop.DBus.Error.AccessDenied":
-				raise PackageKitAccessDenied
-			elif e.get_dbus_name() == "org.freedesktop.DBus.Error.NoReply":
-				raise PackageKitBackendFailure
-			else:
-				raise PackageKitException(e)
-		except Exception:
-			print "wibble"
-			raise
-	return wrapper
-
-
 class PackageKit:
+	def dbusException(func):
+		def wrapper(*args,**kwargs):
+			try:
+				return func(*args,**kwargs)
+			except dbus.exceptions.DBusException,e:
+				if e.get_dbus_name() == "org.freedesktop.DBus.Error.AccessDenied":
+					raise PackageKitAccessDenied
+				elif e.get_dbus_name() == "org.freedesktop.DBus.Error.NoReply":
+					raise PackageKitBackendFailure
+				else:
+					raise PackageKitException(e)
+		return wrapper
+
 	def job_id(func):
 		def wrapper(*args,**kwargs):
 			jid = func(*args,**kwargs)
@@ -220,7 +216,3 @@ class PackageKit:
 	@job_id
 	def RefreshCache(self,force=False):
 		return self.pk_iface.RefreshCache(self.tid(),force)
-
-# hack to avoid exporting them
-del dbusException
-