summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-01-16 13:06:55 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2006-01-16 13:06:55 +0100
commitde1890e85346b00fb2b0b70e0dafcf0a72b68592 (patch)
tree3445ffb043af78a53f29ba2e962b8b4560f7ccee
parente1f06145f20bf0adf62f3d62c5134b37bd0c5067 (diff)
downloadpython-apt-de1890e85346b00fb2b0b70e0dafcf0a72b68592.tar.gz
* ignore failures when unlocking the cache
-rw-r--r--UpdateManager/UpdateManager.py5
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 2 deletions
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index ccc81f42..299cf17d 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -418,7 +418,10 @@ class UpdateManager(SimpleGladeApp):
self.on_treeview_update_cursor_changed(self.treeview_update)
def run_synaptic(self, id, action, lock):
- apt_pkg.PkgSystemUnLock()
+ try:
+ apt_pkg.PkgSystemUnLock()
+ except SystemError:
+ pass
cmd = ["/usr/sbin/synaptic", "--hide-main-window", "--non-interactive",
"--plug-progress-into", "%s" % (id) ]
if action == INSTALL:
diff --git a/debian/changelog b/debian/changelog
index 6fcf4278..f8bd2b62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ update-manager (0.40.3) dapper; urgency=low
- Add a wider border around the changelog and
description
- Align and capitalize the button "Cancel downloading"
- (ubuntu: #28453)
+ (ubuntu: #28453)
-- Michael Vogt <michael.vogt@ubuntu.com> Mon, 16 Jan 2006 12:56:29 +0100