From 6184ae8cff4517797fddf458cedb7d1ec8bbda1a Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Mon, 16 Jan 2006 14:39:51 +0100
Subject: * fix locking error

---
 UpdateManager/UpdateManager.py | 8 +++++++-
 data/UpdateManager.glade       | 5 ++---
 debian/changelog               | 3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 299cf17d..0c655ac6 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -500,6 +500,11 @@ class UpdateManager(SimpleGladeApp):
         scroll.show_all()
         dialog.run()
         dialog.destroy()
+    # unlock the cache here, it will be locked again in fillstore
+    try:
+        apt_pkg.PkgSystemUnLock()
+    except SystemError:
+        pass
     self.fillstore()
 
   def on_button_help_clicked(self, widget):
@@ -814,7 +819,7 @@ class UpdateManager(SimpleGladeApp):
     # get the lock
     try:
         apt_pkg.PkgSystemLock()
-    except SystemError:
+    except SystemError, e:
         d = gtk.MessageDialog(parent=self.window_main,
                               flags=gtk.DIALOG_MODAL,
                               type=gtk.MESSAGE_ERROR,
@@ -824,6 +829,7 @@ class UpdateManager(SimpleGladeApp):
             _("This usually means that another package management "
               "application (like apt-get or aptitude) already running. "
               "Please close that application first")))
+        print "error from apt: '%s'" % e
         res = d.run()
         d.destroy()
         sys.exit()
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index ac76c96d..5bd77311 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -683,7 +683,6 @@ If you have a permanent internet connection this is done automatically. If you a
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Mon, 16 Jan 2006 12:00:13 GMT"/>
 		  <accelerator key="W" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
 		  <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="clicked"/>
 		</widget>
@@ -810,7 +809,7 @@ If you have a permanent internet connection this is done automatically. If you a
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="button_cancel">
+	    <widget class="GtkButton" id="button_stop_download">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
@@ -819,7 +818,7 @@ If you have a permanent internet connection this is done automatically. If you a
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
-	      <signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Thu, 23 Dec 2004 15:53:57 GMT"/>
+	      <signal name="clicked" handler="on_button_stop_download_clicked" last_modification_time="Mon, 16 Jan 2006 12:12:22 GMT"/>
 	    </widget>
 	  </child>
 	</widget>
diff --git a/debian/changelog b/debian/changelog
index f8bd2b62..01db2c7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-update-manager (0.40.3) dapper; urgency=low
+update-manager (0.42ubuntu1) dapper; urgency=low
 
   * improved the HIG comlicane, thanks to Sebastian Heinlein:
     - Rename the button "close" to "cancel"
@@ -8,6 +8,7 @@ update-manager (0.40.3) dapper; urgency=low
       description
      - Align and capitalize the button "Cancel downloading"
     (ubuntu: #28453)
+  * bugfixes in the cache locking
   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 16 Jan 2006 12:56:29 +0100
 
-- 
cgit v1.2.3