Merge branch 'master' of git+ssh://rnorwood@git.packagekit.org/srv/git/PackageKit
This commit is contained in:
commit
085436b3a5
@ -55,7 +55,8 @@ class PackageKitTransactionFailure(PackageKitException):
|
||||
class PackageKitBackendFailure(PackageKitException):
|
||||
pass
|
||||
|
||||
def dbusException(func):
|
||||
class PackageKit:
|
||||
def dbusException(func):
|
||||
def wrapper(*args,**kwargs):
|
||||
try:
|
||||
return func(*args,**kwargs)
|
||||
@ -66,13 +67,8 @@ def dbusException(func):
|
||||
raise PackageKitBackendFailure
|
||||
else:
|
||||
raise PackageKitException(e)
|
||||
except Exception:
|
||||
print "wibble"
|
||||
raise
|
||||
return wrapper
|
||||
|
||||
|
||||
class PackageKit:
|
||||
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user