From 7f6bff5a191c2bb563198f20d1c2803f5054464b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 Aug 2006 12:33:48 +0200
Subject: * merged with the latest upload

---
 UpdateManager/UpdateManager.py | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

(limited to 'UpdateManager')

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index a1eda861..38cffc39 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -712,6 +712,9 @@ class UpdateManager(SimpleGladeApp):
     # don't display apt-listchanges, we already showed the changelog
     os.environ["APT_LISTCHANGES_FRONTEND"]="none"
 
+    # Do not suspend during the update process
+    (dev, cookie) = self.inhibit_sleep()
+
     # set window to insensitive
     self.window_main.set_sensitive(False)
     self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
@@ -726,18 +729,44 @@ class UpdateManager(SimpleGladeApp):
     while gtk.events_pending():
       gtk.main_iteration()
     self.fillstore()
+
+    # Allow suspend after synaptic is finished
+    if cookie != False:
+        self.allow_sleep(dev, cookie)
     self.window_main.set_sensitive(True)
     self.window_main.window.set_cursor(None)
 
+  def inhibit_sleep(self):
+    """Send a dbus signal to gnome-power-manager to not suspend
+    the system"""
+    try:
+      bus = dbus.Bus(dbus.Bus.TYPE_SESSION)
+      devobj = bus.get_object('org.gnome.PowerManager', 
+                              '/org/gnome/PowerManager')
+      dev = dbus.Interface(devobj, "org.gnome.PowerManager")
+      cookie = dev.Inhibit('UpdateManager', 'Updating system')
+      return (dev, cookie)
+    except Exception, e:
+      print "could not send the dbus Inhibit signal: %s" % e
+      return (False, False)
+
+  def allow_sleep(self, dev, cookie):
+    """Send a dbus signal to gnome-power-manager to allow a suspending
+    the system"""
+    dev.UnInhibit(cookie)
+
   def toggled(self, renderer, path):
     """ a toggle button in the listview was toggled """
     iter = self.store.get_iter(path)
+    pkg = self.store.get_value(iter, LIST_PKG)
+    if pkg is None:
+        return
     if self.store.get_value(iter, LIST_INSTALL):
       self.store.set_value(iter, LIST_INSTALL, False)
-      self.remove_update(self.store.get_value(iter, LIST_PKG))
+      self.remove_update(pkg)
     else:
       self.store.set_value(iter, LIST_INSTALL, True)
-      self.add_update(self.store.get_value(iter, LIST_PKG))
+      self.add_update(pkg)
 
   def on_treeview_update_row_activated(self, treeview, path, column, *args):
       """
-- 
cgit v1.2.3


From 558f70b24693a1692be2ab79c4047af762f9e010 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 Aug 2006 14:23:19 +0200
Subject: * properly added -proposed

---
 UpdateManager/UpdateManager.py |  5 +++--
 data/channels/Ubuntu.info.in   | 14 ++++++++++++++
 debian/changelog               |  9 +++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'UpdateManager')

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 38cffc39..3e958db0 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -219,8 +219,9 @@ class UpdateList:
                                                     " of Ubuntu"), 10),
                  ("%s-updates" % dist, "Ubuntu", _("Recommended updates of "
                                                    "Ubuntu"), 9),
-                 ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 8),
-                 (dist, "Ubuntu", _("Updates of Ubuntu"), 7)]
+                 ("%s-proposed" % dist, "Ubuntu", _("Proposed updates for Ubuntu"), 8),
+                 ("%s-backports" % dist, "Ubuntu", _("Backports of Ubuntu"), 7),
+                 (dist, "Ubuntu", _("Updates of Ubuntu"), 6)]
 
     self.pkgs = {}
     self.matcher = {}
diff --git a/data/channels/Ubuntu.info.in b/data/channels/Ubuntu.info.in
index f3eb60d6..5631e93b 100644
--- a/data/channels/Ubuntu.info.in
+++ b/data/channels/Ubuntu.info.in
@@ -48,6 +48,13 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu/
 _Description: Recommended updates
 
+Suite: edgy-proposed
+ParentSuite: edgy
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+_Description: Proposed updates
+
 Suite: edgy-backports
 ParentSuite: edgy
 RepositoryType: deb
@@ -103,6 +110,13 @@ BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu/
 _Description: Recommended updates
 
+Suite: dapper-proposed
+ParentSuite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu/
+_Description: Proposed updates
+
 Suite: dapper-backports
 ParentSuite: dapper
 RepositoryType: deb
diff --git a/debian/changelog b/debian/changelog
index f03a4583..3f60cb20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+update-manager (0.44.4) edgy; urgency=low
+
+  * SoftwareProperties/SoftwareProperties.py:
+    - don't bomb when searching for the mirror (lp: #57015)
+  * UpdateManager/UpdateManager.py:
+    - added "%s-proposed" to the list of known origins
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 24 Aug 2006 13:00:23 +0200
+
 update-manager (0.44.3) edgy; urgency=low
 
   * help/C/update-manager-C.omf:
-- 
cgit v1.2.3