Merge lp:~mterry/update-manager/update-at-start into lp:update-manager

[Michael Terry]

Implements the 'update on start' aspect of the new spec.

This means that all ways to manually start an update are gone from the UI. We no longer warn about how long it's been since the last update, etc.

I've added a new class to handle the initial progress dialog. It just seemed cleaner to me to do it that way rather than introduce more possible states to the main dialog's class. Especially since so little of that class is relevant to the progress dialog.

The progress dialog doesn't look quite like it does in the spec yet. That will require changes to aptdaemon's progress dialog widget. But those can be done separately.

[Michael Terry (mterry)]

Note that I also filed https://code.launchpad.net/~mterry/update-notifier/use-no-update/+merge/108377 to have update-notifier pass --no-update when launching update-manager.

[lp:~mterry/update-manager/update-at-start]

2439. By Michael Terry on 2012-06-13

merge from trunk

[Barry Warsaw (barry)]

When I run ./update-manager from your branch I get the following errors on the console:

% ./update-manager
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 354, in _full_callback
    raise AttributeError('Handler %s not found' % handler_name)
AttributeError: Handler on_button_reload_clicked not found
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/gi/overrides/Gtk.py", line 354, in _full_callback
    raise AttributeError('Handler %s not found' % handler_name)
AttributeError: Handler on_checkbutton_reminder_toggled not found

Probably some additional left over cruft that isn't removed in your branch?

Also, you mention a spec, but I'm not aware of it. Do you have a link?

Minor misspelling at the top of UpdateProgress.py

You might want to run pyflakes over UpdateProgress.py. Unused imports include Gtk, _, ngettext
Also, you can probably collapse the .Core.utils import onto one line
Spaces around the = sign when setting os.environ[]
4 space indents please! :)

Could you add some tests for the new functionality and files?

review: Needs Fixing

[Michael Terry (mterry)]

The spec is https://wiki.ubuntu.com/SoftwareUpdates

The AttributeError is likely because you need to point at the new glade files too (update-manager isn't smart enough to look in the local location). So either futz with XDG_DATA_DIRS or just do "sudo cp data/gtkbuilder/* /usr/share/update-manager/gtkbuilder/"

I'll update UpdateProgress.py and fix the nits. You're killing me with the 4-indents. Not that I care, but update-manager source is very inconsistent with 2 or 4, even inside a file, so I've tried to always stick with 2 in all my pending branches. :(

[lp:~mterry/update-manager/update-at-start]

2440. By Michael Terry on 2012-06-19

review style nits and pyflakes fixes

[Michael Terry (mterry)]

OK, I've updated to fix nits. I'm not going to do the 4-indent change, because that would cause massive headache with all my chain of pending merges. I'd rather just do a big flag-day indent fixup branch at the end, which will fix existing inconsistencies too.

As for tests, I'd like to talk to mvo first about what his plans were for tests going forward. (tests right now are very hodge-pogde; some rely on internal test-only flags for detecting if a dialog was shown, some just use direct imports of modules and poke around, I don't think any use a UI-driving framework) It's fine if that's a blocker, but it's not something I can fix right this second.

[Michael Vogt (mvo)]

On Tue, Jun 19, 2012 at 09:56:18PM -0000, Michael Terry wrote:
> The spec is https://wiki.ubuntu.com/SoftwareUpdates
>
> The AttributeError is likely because you need to point at the new glade files too (update-manager isn't smart enough to look in the local location). So either futz with XDG_DATA_DIRS or just do "sudo cp data/gtkbuilder/* /usr/share/update-manager/gtkbuilder/"

Alternatively:
$ ./update-manager --data-dir ./data
should work too.

> I'll update UpdateProgress.py and fix the nits. You're killing me with the 4-indents. Not that I care, but update-manager source is very inconsistent with 2 or 4, even inside a file, so I've tried to always stick with 2 in all my pending branches. :(

Yeah, its a big pain, given the restructure that is going on, it
sounds like a good time to make it consistently 4 spaces, wdyt?

Cheers,
 Michael

[Michael Vogt (mvo)]

On Tue, Jun 19, 2012 at 10:07:18PM -0000, Michael Terry wrote:
> OK, I've updated to fix nits. I'm not going to do the 4-indent change, because that would cause massive headache with all my chain of pending merges. I'd rather just do a big flag-day indent fixup branch at the end, which will fix existing inconsistencies too.

That sounds like a reasonable approach.

> As for tests, I'd like to talk to mvo first about what his plans were for tests going forward. (tests right now are very hodge-pogde; some rely on internal test-only flags for detecting if a dialog was shown, some just use direct imports of modules and poke around, I don't think any use a UI-driving framework) It's fine if that's a blocker, but it's not something I can fix right this second.

Indeed, there is no UI-driving framework, my experience with all of
them wasn't that great, so its importing and poking around at the
modules/classes. I'm happy about u-m moving towards a UI-driving
framework, suggestions for a good one welcome.

Cheers,
 Michael

[Michael Terry (mterry)]

<mterry> mvo, darn, I was hoping you had been hiding some amazing UI driving framework that you had been too lazy to use. :-/
<mterry> mvo, the best I've used is ldtp, but it's very rickety
<mvo> mterry: yeah, excatly, I wasn't overly impressed with that one :/
<mterry> mvo, well, I'm happy to write various tests, but since doing so might involve various code changes (for instrumentation) and since code is moving around a lot in my branches, would you mind if I did a big test branch after all these intermediate branches land? (ala the indentation one)
<mvo> mterry: that is fine with me (for the given reasons)

So I'll start working on an indentation branch and a testing branch after my branches land on trunk. I believe that means there's no outstanding issue with this particular branch. Could I get a re-review?

[Ken VanDine (ken-vandine)]

I got a very minor merge conflict for UpdateManager/UpdateManager.py

<<<<<<< TREE
          if self._get_last_apt_get_update_text() is not None:
              text_label_main = self._get_last_apt_get_update_text()
              ago_minutes = self._get_last_apt_get_update_minutes()
              if ago_minutes is not None and ago_minutes > self.NO_UPDATE_WARNING_DAYS*24*60:
                  text_header = _("Software updates may be available for your computer.")
          # add timer to ensure we update the information when the
          # last package count update was performed
          GObject.timeout_add_seconds(10, self.update_last_updated_text, None)
=======
>>>>>>> MERGE-SOURCE

I manually fixed the merge and tested. After applying updates I noticed the "Details of updates" expander doesn't get hidden. Perhaps that is expected at this point and fixed in another branch.

Still reviewing... more to come later.

[Barry Warsaw (barry)]

On Jun 22, 2012, at 06:36 PM, Ken VanDine wrote:

>I got a very minor merge conflict for UpdateManager/UpdateManager.py
>
><<<<<<< TREE
> if self._get_last_apt_get_update_text() is not None:
> text_label_main = self._get_last_apt_get_update_text()
> ago_minutes = self._get_last_apt_get_update_minutes()
> if ago_minutes is not None and ago_minutes > self.NO_UPDATE_WARNING_DAYS*24*60:
> text_header = _("Software updates may be available for your computer.")
> # add timer to ensure we update the information when the
> # last package count update was performed
> GObject.timeout_add_seconds(10, self.update_last_updated_text, None)
>=======
>>>>>>>> MERGE-SOURCE

I get the same conflict against trunk. I suppose that chunk of code is
supposed to be removed?

[Barry Warsaw (barry)]

On Jun 19, 2012, at 10:07 PM, Michael Terry wrote:

>OK, I've updated to fix nits. I'm not going to do the 4-indent change,
>because that would cause massive headache with all my chain of pending
>merges. I'd rather just do a big flag-day indent fixup branch at the end,
>which will fix existing inconsistencies too.

I think it's fine to defer the reindentation, and I agree the code base is
fairly inconsistent about indentation right now. It would be nice at some
point to do a thorough PEP-8-ification of the code.

>As for tests, I'd like to talk to mvo first about what his plans were for
>tests going forward. (tests right now are very hodge-pogde; some rely on
>internal test-only flags for detecting if a dialog was shown, some just use
>direct imports of modules and poke around, I don't think any use a UI-driving
>framework) It's fine if that's a blocker, but it's not something I can fix
>right this second.

I guess not. This is another thing I'd really like to do at some point,
i.e. refactor the code to be more testable and have better coverage.

Right now your branch is conflicting with trunk. Can you resolve that and
push an update?

[Ken VanDine (ken-vandine)]

On Fri, 2012-06-22 at 18:22 -0400, Barry Warsaw wrote:
> On Jun 22, 2012, at 06:36 PM, Ken VanDine wrote:
>
> >I got a very minor merge conflict for UpdateManager/UpdateManager.py
> >
> ><<<<<<< TREE
> > if self._get_last_apt_get_update_text() is not None:
> > text_label_main = self._get_last_apt_get_update_text()
> > ago_minutes = self._get_last_apt_get_update_minutes()
> > if ago_minutes is not None and ago_minutes > self.NO_UPDATE_WARNING_DAYS*24*60:
> > text_header = _("Software updates may be available for your computer.")
> > # add timer to ensure we update the information when the
> > # last package count update was performed
> > GObject.timeout_add_seconds(10, self.update_last_updated_text, None)
> >=======
> >>>>>>>> MERGE-SOURCE
>
> I get the same conflict against trunk. I suppose that chunk of code is
> supposed to be removed?
>

Looks like it to me.

--
Ken VanDine
Ubuntu Desktop Integration Engineer
Canonical, Ltd.

[lp:~mterry/update-manager/update-at-start]

2441. By Michael Terry on 2012-06-25

merge from trunk

[Michael Terry (mterry)]

Yup, the conflicting code just needed to be removed. How about now?

[Barry Warsaw (barry)]

Looks good now, thanks.

review: Approve

[Barry Warsaw (barry)]

On Jun 25, 2012, at 03:06 PM, Michael Terry wrote:

>Yup, the conflicting code just needed to be removed. How about now?

Looks good, thanks. I've merged this into trunk, but didn't upload it, in
case there are other upcoming changes for u-m. Happy to upload it if you
prefer though.

=== modified file 'UpdateManager/UnitySupport.py'
--- UpdateManager/UnitySupport.py	2011-08-11 11:47:34 +0000
+++ UpdateManager/UnitySupport.py	2012-06-25 15:02:27 +0000
@@ -51,15 +51,6 @@
 
     def _add_quicklist(self, parent):
             quicklist = Dbusmenu.Menuitem.new()
-            # update
-            update_dbusmenuitem = Dbusmenu.Menuitem.new()
-            update_dbusmenuitem.property_set(
-                Dbusmenu.MENUITEM_PROP_LABEL, _("Check for Updates"))
-            update_dbusmenuitem.property_set_bool(
-                Dbusmenu.MENUITEM_PROP_VISIBLE, True)
-            update_dbusmenuitem.connect (
-                "item-activated", parent.on_button_reload_clicked, None)
-            quicklist.child_append(update_dbusmenuitem)
             # install 
             self.install_dbusmenuitem = Dbusmenu.Menuitem.new()
             self.install_dbusmenuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
 
=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2012-06-14 21:14:13 +0000
+++ UpdateManager/UpdateManager.py	2012-06-25 15:02:27 +0000
@@ -1,6 +1,6 @@
 # UpdateManager.py
 #  
-#  Copyright (c) 2004-2010 Canonical
+#  Copyright (c) 2004-2012 Canonical
 #                2004 Michiel Sikkes
 #                2005 Martin Willemoes Hansen
 #                2010 Mohamed Amine IL Idrissi
@@ -10,6 +10,7 @@
 #          Martin Willemoes Hansen <[e-mail]>
 #          Mohamed Amine IL Idrissi <[e-mail]>
 #          Alex Launi <[e-mail]>
+#          Michael Terry <[e-mail]>
 # 
 #  This program is free software; you can redistribute it and/or 
 #  modify it under the terms of the GNU General Public License as 
@@ -40,12 +41,10 @@
 
 import apt_pkg
 
-import gettext
 import sys
 import os
 import stat
 import re
-import locale
 import logging
 import operator
 import subprocess
@@ -66,7 +65,6 @@
 
 
 from .Core.utils import (humanize_size,
-                         init_proxy,
                          on_battery,
                          inhibit_sleep,
                          allow_sleep)
@@ -91,9 +89,6 @@
 # list constants
 (LIST_CONTENTS, LIST_NAME, LIST_PKG, LIST_ORIGIN, LIST_TOGGLE_CHECKED) = range(5)
 
-# actions for "invoke_manager"
-(INSTALL, UPDATE) = range(2)
-
 # file that signals if we need to reboot
 REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
 
@@ -140,27 +135,14 @@
         return True
 
     @dbus.service.method('org.freedesktop.UpdateManagerIFace')
-    def update(self):
-        try:
-            self.alert_watcher.check_alert_state ()
-            self.parent.invoke_manager(UPDATE)
-            return self.connected
-        except:
-            return False
-
-    @dbus.service.method('org.freedesktop.UpdateManagerIFace')
     def upgrade(self):
         try:
             self.parent.cache.checkFreeSpace()
-            self.parent.invoke_manager(INSTALL)
+            self.parent.invoke_manager()
             return True
         except:
             return False
 
-    @dbus.service.signal('org.freedesktop.UpdateManagerIFace', 'b')
-    def updated(self, success):
-        pass
-
     def _on_network_alert(self, watcher, state):
         if state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST:
             self.connected = True
@@ -169,21 +151,12 @@
 
 class UpdateManager(SimpleGtkbuilderApp):
 
-  # how many days until u-m warns about manual pressing "check"
-  NO_UPDATE_WARNING_DAYS = 7
-
   def __init__(self, datadir, options):
     self.setupDbus()
-    Gtk.Window.set_default_icon_name("system-software-update")
     self.datadir = datadir
+    self.options = options
     SimpleGtkbuilderApp.__init__(self, datadir+"gtkbuilder/UpdateManager.ui",
                                  "update-manager")
-    gettext.bindtextdomain("update-manager", "/usr/share/locale")
-    gettext.textdomain("update-manager")
-    try:
-        locale.setlocale(locale.LC_ALL, "")
-    except:
-        logging.exception("setlocale failed")
 
     # Used for inhibiting power management
     self.sleep_cookie = None
@@ -192,7 +165,6 @@
     # workaround for LP: #945536
     self.clearing_store = False
 
-    self.image_logo.set_from_icon_name("system-software-update", Gtk.IconSize.DIALOG)
     self.window_main.set_sensitive(False)
     self.window_main.grab_focus()
     self.button_close.grab_focus()
@@ -257,13 +229,10 @@
         self.button_settings.set_sensitive(False)
 
     self.settings =  Gio.Settings("com.ubuntu.update-manager")
-    init_proxy(self.settings)
     # init show version
     self.show_versions = self.settings.get_boolean("show-versions")
     # init summary_before_name
     self.summary_before_name = self.settings.get_boolean("summary-before-name")
-    # keep track when we run (for update-notifier)
-    self.settings.set_int("launch-time", int(time.time()))
 
     # get progress object
     self.progress = GtkOpProgressInline(
@@ -366,10 +335,6 @@
          self.dbusController = UpdateManagerDbusController(self, bus_name)
 
 
-  def on_checkbutton_reminder_toggled(self, checkbutton):
-    self.settings.set_boolean("remind-reload",
-                              not checkbutton.get_active())
-
   def close(self, widget, data=None):
     if self.window_main.get_property("sensitive") is False:
         return True
@@ -600,74 +565,11 @@
           self.hbox_downsize.show()
           self.vbox_alerts.show()
 
-  def _get_last_apt_get_update_minutes(self):
-      """
-      Return the number of minutes since the last successful apt-get update
-      
-      If the date is unknown, return "None"
-      """
-      if not os.path.exists("/var/lib/apt/periodic/update-success-stamp"):
-          return None
-      # calculate when the last apt-get update (or similar operation)
-      # was performed
-      mtime = os.stat("/var/lib/apt/periodic/update-success-stamp")[stat.ST_MTIME]
-      ago_minutes = int((time.time() - mtime) / 60 )
-      return ago_minutes
-
-  def _get_last_apt_get_update_text(self):
-      """
-      return a human readable string with the information when
-      the last apt-get update was run
-      """
-      ago_minutes = self._get_last_apt_get_update_minutes()
-      if ago_minutes is None:
-          return _("It is unknown when the package information was "
-                   "updated last. Please click the 'Check' "
-                   "button to update the information.")
-      ago_hours = int( ago_minutes / 60 )
-      ago_days = int( ago_hours / 24 )
-      if ago_days > self.NO_UPDATE_WARNING_DAYS:
-          return _("The package information was last updated %(days_ago)s "
-                   "days ago.\n"
-                   "Press the 'Check' button below to check for new software "
-                   "updates.") % { "days_ago" : ago_days, }
-      elif ago_days > 0:
-          return ngettext("The package information was last updated %(days_ago)s day ago.",
-                          "The package information was last updated %(days_ago)s days ago.",
-                          ago_days) % { "days_ago" : ago_days, }
-      elif ago_hours > 0:
-          return ngettext("The package information was last updated %(hours_ago)s hour ago.",
-                          "The package information was last updated %(hours_ago)s hours ago.",
-                          ago_hours) % { "hours_ago" : ago_hours, }
-      elif ago_minutes >= 45:
-          # TRANSLATORS: only in plural form, as %s minutes ago is one of 15, 30, 45 minutes ago
-          return _("The package information was last updated about %s minutes ago.")%45
-      elif ago_minutes >= 30:
-          return _("The package information was last updated about %s minutes ago.")%30
-      elif ago_minutes >= 15:
-          return _("The package information was last updated about %s minutes ago.")%15
-      else:
-          return _("The package information was just updated.")
-      return None
-
-  def update_last_updated_text(self, user_data):
-      """timer that updates the last updated text """
-      #print("update_last_updated_text")
-      num_updates = self.cache.install_count
-      if num_updates == 0:
-          if self._get_last_apt_get_update_text() is not None:
-              text_label_main = self._get_last_apt_get_update_text()
-              self.label_main_details.set_text(text_label_main)
-          return True
-      # stop the timer if there are upgrades now
-      return False
-
   def update_count(self):
       """activate or disable widgets and show dialog texts correspoding to
          the number of available updates"""
       self.refresh_updates_count()
       num_updates = self.cache.install_count
-      text_label_main = ""
 
       # setup unity stuff
       self.unity.set_updates_count(num_updates)
@@ -683,14 +585,6 @@
           self.button_close.grab_default()
           self.textview_changes.get_buffer().set_text("")
           self.textview_descr.get_buffer().set_text("")
-          if self._get_last_apt_get_update_text() is not None:
-              text_label_main = self._get_last_apt_get_update_text()
-              ago_minutes = self._get_last_apt_get_update_minutes()
-              if ago_minutes is not None and ago_minutes > self.NO_UPDATE_WARNING_DAYS*24*60:
-                  text_header = _("Software updates may be available for your computer.")
-          # add timer to ensure we update the information when the 
-          # last package count update was performed
-          GObject.timeout_add_seconds(10, self.update_last_updated_text, None)
       else:
           # show different text on first run (UX team suggestion)
           firstrun = self.settings.get_boolean("first-run")
@@ -704,7 +598,6 @@
           self.button_install.grab_default()
           self.treeview_update.set_cursor(Gtk.TreePath.new_from_string("1"), None, False)
       self.label_header.set_markup(text_header)
-      self.label_main_details.set_text(text_label_main)
       return True
 
   # Before we shrink the window, capture the size
@@ -725,11 +618,6 @@
     expanded = self.expander_desc.get_expanded()
     self.expander_desc.set_vexpand(expanded)
 
-  def on_button_reload_clicked(self, widget, menuitem = None, data = None):
-    #print("on_button_reload_clicked")
-    self.check_metarelease()
-    self.invoke_manager(UPDATE)
-
   #def on_button_help_clicked(self, widget):
   #  self.help_viewer.run()
 
@@ -774,7 +662,7 @@
         return
     except SystemError as e:
         logging.exception("free space check failed")
-    self.invoke_manager(INSTALL)
+    self.invoke_manager()
     
   def on_button_restart_required_clicked(self, button=None):
       self._request_reboot_via_session_manager()
@@ -807,7 +695,7 @@
     except dbus.DBusException:
         pass
 
-  def invoke_manager(self, action):
+  def invoke_manager(self):
     # check first if no other package manager is runing
 
     # don't display apt-listchanges, we already showed the changelog
@@ -819,30 +707,23 @@
     # set window to insensitive
     self.window_main.set_sensitive(False)
     self.window_main.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH))
-#
-    # do it
-    if action == UPDATE:
-        self.install_backend.update()
-    elif action == INSTALL:
-        # If the progress dialog should be closed automatically afterwards
-        settings = Gio.Settings("com.ubuntu.update-manager")
-        close_on_done = settings.get_boolean("autoclose-install-window")
-        # Get the packages which should be installed and update
-        pkgs_install = []
-        pkgs_upgrade = []
-        for pkg in self.cache:
-            if pkg.marked_install:
-                pkgs_install.append(pkg.name)
-            elif pkg.marked_upgrade:
-                pkgs_upgrade.append(pkg.name)
-        self.install_backend.commit(pkgs_install, pkgs_upgrade, close_on_done)
+
+    # If the progress dialog should be closed automatically afterwards
+    settings = Gio.Settings("com.ubuntu.update-manager")
+    close_on_done = settings.get_boolean("autoclose-install-window")
+    # Get the packages which should be installed and update
+    pkgs_install = []
+    pkgs_upgrade = []
+    for pkg in self.cache:
+        if pkg.marked_install:
+            pkgs_install.append(pkg.name)
+        elif pkg.marked_upgrade:
+            pkgs_upgrade.append(pkg.name)
+    self.install_backend.commit(pkgs_install, pkgs_upgrade, close_on_done)
 
   def _on_backend_done(self, backend, action, authorized, success):
-    if (action == UPDATE):
-        self.dbusController.updated(success)
     # check if there is a new reboot required notification
-    if (action == INSTALL and
-        os.path.exists(REBOOT_REQUIRED_FILE)):
+    if os.path.exists(REBOOT_REQUIRED_FILE):
         self.show_reboot_required_info()
     if authorized:
         msg = _("Reading package information")
@@ -861,7 +742,6 @@
       # can deal with dialup connections properly
       if state in NetworkManagerHelper.NM_STATE_CONNECTING_LIST:
           self.label_offline.set_text(_("Connecting..."))
-          #self.button_reload.set_sensitive(False)
           self.refresh_updates_count()
           self.hbox_offline.show()
           self.vbox_alerts.show()
@@ -869,7 +749,6 @@
       # in doubt (STATE_UNKNOWN), assume connected
       elif (state in NetworkManagerHelper.NM_STATE_CONNECTED_LIST or 
            state == NetworkManagerHelper.NM_STATE_UNKNOWN):
-          #self.button_reload.set_sensitive(True)
           self.refresh_updates_count()
           self.hbox_offline.hide()
           self.connected = True
@@ -878,7 +757,6 @@
       else:
           self.connected = False
           self.label_offline.set_text(_("You may not be able to check for updates or download new updates."))
-          #self.button_reload.set_sensitive(False)
           self.refresh_updates_count()
           self.hbox_offline.show()
           self.vbox_alerts.show()
@@ -1022,11 +900,7 @@
 
     # fill them again
     try:
-        # This is  a quite nasty hack to stop the initial update 
-        if not self.options.no_update:
-            self.list.update(self.cache)
-        else:
-            self.options.no_update = False
+        self.list.update(self.cache)
     except SystemError as e:
         msg = ("<big><b>%s</b></big>\n\n%s\n'%s'" %
                (_("Could not calculate the upgrade"),
@@ -1167,22 +1041,6 @@
     else:
         self.progress.all_done()
 
-  def check_auto_update(self):
-      # Check if automatic update is enabled. If not show a dialog to inform
-      # the user about the need of manual "reloads"
-      remind = self.settings.get_boolean("remind-reload")
-      if remind == False:
-          return
-
-      update_days = apt_pkg.config.find_i("APT::Periodic::Update-Package-Lists")
-      if update_days < 1:
-          self.dialog_manual_update.set_transient_for(self.window_main)
-          self.dialog_manual_update.set_title("")
-          res = self.dialog_manual_update.run()
-          self.dialog_manual_update.hide()
-          if res == Gtk.ResponseType.YES:
-              self.on_button_reload_clicked(None)
-
   def check_all_updates_installable(self):
     """ Check if all available updates can be installed and suggest
         to run a distribution upgrade if not """
@@ -1214,9 +1072,7 @@
           self.meta.connect("new_dist_available",self.new_dist_available)
       
 
-  def main(self, options):
-    self.options = options
-
+  def main(self):
     # check for new distributin information
     self.check_metarelease()
 
@@ -1224,6 +1080,4 @@
       Gtk.main_iteration()
 
     self.fillstore()
-    self.check_auto_update()
     self.alert_watcher.check_alert_state()
-    Gtk.main()
 
=== added file 'UpdateManager/UpdateProgress.py'
--- UpdateManager/UpdateProgress.py	1970-01-01 00:00:00 +0000
+++ UpdateManager/UpdateProgress.py	2012-06-25 15:02:27 +0000
@@ -0,0 +1,84 @@
+# UpdateProgress.py
+#  
+#  Copyright (c) 2004-2012 Canonical
+#                2004 Michiel Sikkes
+#                2005 Martin Willemoes Hansen
+#                2010 Mohamed Amine IL Idrissi
+#  
+#  Author: Michiel Sikkes <[e-mail]>
+#          Michael Vogt <[e-mail]>
+#          Martin Willemoes Hansen <[e-mail]>
+#          Mohamed Amine IL Idrissi <[e-mail]>
+#          Alex Launi <[e-mail]>
+#          Michael Terry <[e-mail]>
+# 
+#  This program is free software; you can redistribute it and/or 
+#  modify it under the terms of the GNU General Public License as 
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+# 
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+# 
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+#  USA
+
+from __future__ import absolute_import, print_function
+
+from gi.repository import GLib
+
+import warnings
+warnings.filterwarnings("ignore", "Accessed deprecated property", DeprecationWarning)
+
+import os
+import sys
+
+from .backend import get_backend
+
+from UpdateManager.UpdateManager import UpdateManager
+from .Core.utils import inhibit_sleep, allow_sleep
+
+class UpdateProgress(object):
+
+  def __init__(self, datadir, options):
+    self.datadir = datadir
+    self.options = options
+
+    # Used for inhibiting power management
+    self.sleep_cookie = None
+    self.sleep_dev = None
+
+    # get the install backend
+    self.install_backend = get_backend(None)
+    self.install_backend.connect("action-done", self._on_backend_done)
+
+  def invoke_manager(self):
+    # don't display apt-listchanges
+    os.environ["APT_LISTCHANGES_FRONTEND"] = "none"
+
+    # Do not suspend during the update process
+    (self.sleep_dev, self.sleep_cookie) = inhibit_sleep()
+
+    self.install_backend.update()
+
+  def _on_backend_done(self, backend, action, authorized, success):
+    # Allow suspend after synaptic is finished
+    if self.sleep_cookie:
+      allow_sleep(self.sleep_dev, self.sleep_cookie)
+      self.sleep_cookie = self.sleep_dev = None
+
+    # Either launch main dialog and continue or quit altogether
+    if success:
+      app = UpdateManager(self.datadir, self.options)
+      # Run app.main at idle time so the progress dialog can close before we
+      # do lengthy recalculation in app.main
+      GLib.idle_add(app.main)
+    else:
+      sys.exit(0)
+
+  def main(self):
+    self.invoke_manager()
 
=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2012-05-01 00:29:04 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2012-06-25 15:02:27 +0000
@@ -12,6 +12,8 @@
 from UpdateManager.backend import InstallBackend
 from UpdateManager.UnitySupport import UnitySupport
 
+from gettext import gettext as _
+
 import apt
 import dbus
 
@@ -33,7 +35,7 @@
             pass
         try:
             trans = yield self.client.update_cache(defer=True)
-            yield self._run_in_dialog(trans, self.UPDATE)
+            yield self._run_in_dialog(trans, self.UPDATE, False)
         except errors.NotAuthorizedError:
             self.emit("action-done", self.UPDATE, False, False)
         except:
@@ -53,7 +55,7 @@
                 pkgs_install, reinstall, remove, purge, pkgs_upgrade, 
                 downgrade, defer=True)
             trans.connect("progress-changed", self._on_progress_changed)
-            yield self._run_in_dialog(trans, self.INSTALL)
+            yield self._run_in_dialog(trans, self.INSTALL, True)
         except errors.NotAuthorizedError as e:
             self.emit("action-done", self.INSTALL, False, False)
         except dbus.DBusException as e:
@@ -70,18 +72,22 @@
         self.unity.set_progress(progress)
 
     @inline_callbacks
-    def _run_in_dialog(self, trans, action):
+    def _run_in_dialog(self, trans, action, show_details):
         dia = AptProgressDialog(trans, parent=self.window_main)
         dia.set_icon_name("system-software-update")
+        dia.set_title(_("Software Updater"))
+        if not show_details:
+            dia.expander.set_no_show_all(True)
+            dia.expander.hide()
         dia.connect("finished", self._on_finished, action)
-        yield dia.run()
+        yield dia.run(close_on_finished=False)
 
     def _on_finished(self, dialog, action):
-        dialog.hide()
         # tell unity to hide the progress again
         self.unity.set_progress(-1)
         self.emit("action-done", action, 
                   True, dialog._transaction.exit == EXIT_SUCCESS)
+        dialog.hide()
 
 if __name__ == "__main__":
     b = InstallBackendAptdaemon(None)
 
=== modified file 'data/com.ubuntu.update-manager.gschema.xml.in'
--- data/com.ubuntu.update-manager.gschema.xml.in	2012-05-31 22:18:33 +0000
+++ data/com.ubuntu.update-manager.gschema.xml.in	2012-06-25 15:02:27 +0000
@@ -1,10 +1,5 @@
 <schemalist>
   <schema id="com.ubuntu.update-manager" path="/apps/update-manager/">
-    <key name="remind-reload" type="b">
-      <default>true</default>
-      <summary>Remind to reload the channel list</summary>
-      <description>If automatic checking for updates is disabled, you have to reload the channel list manually. This option allows to hide the reminder shown in this case.</description>
-    </key>
     <key name="show-details" type="b">
       <default>false</default>
       <summary>Show details of an update</summary>
 
=== modified file 'data/gtkbuilder/UpdateManager.ui'
--- data/gtkbuilder/UpdateManager.ui	2012-05-31 22:18:33 +0000
+++ data/gtkbuilder/UpdateManager.ui	2012-06-25 15:02:27 +0000
@@ -230,153 +230,6 @@
       <action-widget response="-7">okbutton3</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkDialog" id="dialog_manual_update">
-    <property name="can_focus">False</property>
-    <property name="border_width">6</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox4">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">12</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="cancelbutton1">
-                <property name="label" translatable="yes">Chec_k</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="image">image-refresh</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="okbutton2">
-                <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox16">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="border_width">6</property>
-            <property name="spacing">11</property>
-            <child>
-              <object class="GtkImage" id="image12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="stock">gtk-dialog-info</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="spacing">12</property>
-                <child>
-                  <object class="GtkLabel" id="label27">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="xalign">0</property>
-                    <property name="yalign">0</property>
-                    <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;You must check for updates manually&lt;/big&gt;&lt;/b&gt;
-
-Your system does not check for updates automatically. You can configure this behavior in &lt;i&gt;Software Sources&lt;/i&gt; on the &lt;i&gt;Updates&lt;/i&gt; tab.</property>
-                    <property name="use_markup">True</property>
-                    <property name="wrap">True</property>
-                    <property name="selectable">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_reminder">
-                    <property name="label" translatable="yes">_Hide this information in the future</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="draw_indicator">True</property>
-                    <signal name="toggled" handler="on_checkbutton_reminder_toggled" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-8">cancelbutton1</action-widget>
-      <action-widget response="-7">okbutton2</action-widget>
-    </action-widgets>
-  </object>
   <object class="GtkDialog" id="dialog_on_battery">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -607,11 +460,6 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-apply</property>
   </object>
-  <object class="GtkImage" id="image-refresh">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="stock">gtk-refresh</property>
-  </object>
   <object class="GtkWindow" id="window_fetch">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -796,6 +644,8 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="yalign">0</property>
+                    <property name="pixel_size">48</property>
+                    <property name="icon_name">system-software-update</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -804,46 +654,19 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox_label_main">
+                  <object class="GtkLabel" id="label_header">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label_header">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="label" translatable="yes">Starting Software Updater</property>
-                        <property name="use_underline">True</property>
-                        <property name="wrap">True</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1.25"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_main_details">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="use_underline">True</property>
+                    <property name="wrap">True</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                      <attribute name="scale" value="1.25"/>
+                    </attributes>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
@@ -998,6 +821,9 @@
                             </child>
                             <signal name="cursor-changed" handler="on_treeview_update_cursor_changed" swapped="no"/>
                             <signal name="row-activated" handler="on_treeview_update_row_activated" swapped="no"/>
+                            <child internal-child="selection">
+                              <object class="GtkTreeSelection" id="treeview-selection2"/>
+                            </child>
                           </object>
                         </child>
                       </object>
@@ -1365,24 +1191,6 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="button_reload">
-                <property name="label" translatable="yes">Chec_k</property>
-                <property name="use_action_appearance">False</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="image">image-refresh</property>
-                <property name="use_underline">True</property>
-                <signal name="clicked" handler="on_button_reload_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="button_close">
                 <property name="label">gtk-close</property>
                 <property name="use_action_appearance">False</property>
 
=== modified file 'data/update-manager.convert'
--- data/update-manager.convert	2012-05-31 22:18:33 +0000
+++ data/update-manager.convert	2012-06-25 15:02:27 +0000
@@ -1,5 +1,4 @@
 [com.ubuntu.update-manager]
-remind-reload = /apps/update-manager/remind_reload
 show-details = /apps/update-manager/show_details
 check-dist-upgrades = /apps/update-manager/check_dist_upgrades
 autoclose-install-window = /apps/update-manager/autoclose_install_window
 
=== modified file 'update-manager'
--- update-manager	2012-06-13 22:45:57 +0000
+++ update-manager	2012-06-25 15:02:27 +0000
@@ -26,13 +26,17 @@
 from __future__ import print_function
 
 from gi.repository import Gtk
+from gi.repository import Gio
 import gi
 gi.require_version("Gtk", "3.0")
 
 import os
 import sys
+import time
 
 from UpdateManager.UpdateManager import UpdateManager
+from UpdateManager.UpdateProgress import UpdateProgress
+from UpdateManager.Core.utils import init_proxy
 from DistUpgrade.DistUpgradeVersion import VERSION
 import locale
 import gettext
@@ -42,7 +46,8 @@
 if __name__ == "__main__":
 
   Gtk.init_check(sys.argv)
-  
+  Gtk.Window.set_default_icon_name("system-software-update")
+
   #FIXME: Workaround a bug in optparser which doesn't handle unicode/str
   #       correctly, see http://bugs.python.org/issue4391
   #       Should be resolved by Python3
@@ -117,5 +122,14 @@
     controller = DistUpgradeController(view, datadir=data_dir)
     controller.doPartialUpgrade()
   else:
-    app = UpdateManager(data_dir, options)
-    app.main(options)
+    # keep track when we run (for update-notifier)
+    settings =  Gio.Settings("com.ubuntu.update-manager")
+    settings.set_int("launch-time", int(time.time()))
+    init_proxy(settings)
+
+    if options.no_update:
+      app = UpdateManager(data_dir, options)
+    else:
+      app = UpdateProgress(data_dir, options)
+    app.main()
+    Gtk.main()