Merge lp:~ilidrissi.amine/update-manager/interactive-check into lp:update-manager

[Mohamed Amine Ilidrissi]

This branch introduces automatic checking for updates when launched with the --automatic-check option, which is enabled by default on the .desktop file, this according to https://wiki.ubuntu.com/SoftwareUpdateHandling#Launching.

[lp:~ilidrissi.amine/update-manager/interactive-check]

1877. By Mohamed Amine Ilidrissi on 2010-08-02

merge with trunk

1878. By Mohamed Amine IL Idrissi <devildante@devildante-laptop> on 2010-08-02

modified debian/changelog.

[Michael Terry (mterry)]

This got fixed a different way recently, but with the same effect. Software Updater now checks for updates on startup by default. Thanks for the branch, though it didn't end up getting used!

I'll just mark that this branch is rejected, since it is now redundant.

review: Disapprove

Unmerged revisions

1878. By Mohamed Amine IL Idrissi <devildante@devildante-laptop> on 2010-08-02

modified debian/changelog.

1877. By Mohamed Amine Ilidrissi on 2010-08-02

merge with trunk

1876. By Mohamed Amine Ilidrissi on 2010-07-28

Finished implementing interactive check.

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2010-07-28 13:57:54 +0000
+++ UpdateManager/UpdateManager.py	2010-08-03 09:07:43 +0000
@@ -110,6 +110,7 @@
 class UpdateManager(SimpleGtkbuilderApp):
 
   def __init__(self, datadir, options):
+    self.options = options
     self.setupDbus()
     gtk.window_set_default_icon_name("update-manager")
     self.datadir = datadir
@@ -211,11 +212,16 @@
         self.window_main.set_focus_on_map(False)
         if self.progress._window:
             self.progress._window.set_focus_on_map(False)
-    # show the main window
-    self.window_main.show()
     # get the install backend
     self.install_backend = backend.get_backend(self.window_main)
     self.install_backend.connect("action-done", self._on_backend_done)
+    self.finished_checking = False
+    if options.automatic_check:
+        self.install_backend.update()
+        while not self.finished_checking: # FIXME: more appropriate way?
+            gtk.main_iteration()
+    # show the main window
+    self.window_main.show()
     # it can only the iconified *after* it is shown (even if the docs
     # claim otherwise)
     if options.no_focus_on_map:
@@ -651,6 +657,7 @@
         self.install_backend.commit(pkgs_install, pkgs_upgrade, close_on_done)
 
   def _on_backend_done(self, backend, action):
+    self.finished_checking = True
     # check if there is a new reboot required notification
     if (action == INSTALL and
         os.path.exists(REBOOT_REQUIRED_FILE)):

=== modified file 'data/update-manager.desktop.in'
--- data/update-manager.desktop.in	2008-03-10 10:05:05 +0000
+++ data/update-manager.desktop.in	2010-08-03 09:07:43 +0000
@@ -2,7 +2,7 @@
 _Name=Update Manager
 _GenericName=Software Updates
 _Comment=Show and install available updates
-Exec=/usr/bin/update-manager
+Exec=/usr/bin/update-manager --automatic-check
 Icon=update-manager
 Terminal=false
 Type=Application

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-28 13:57:54 +0000
+++ debian/changelog	2010-08-03 09:07:43 +0000
@@ -3,6 +3,12 @@
   * more python-apt 0.8 porting
   * less updates to the progressbar
 
+  [ Mohamed Amine IL Idrissi ]
+  * update-manager now automatically checks for updates when
+    manually launched (according to 
+    https://wiki.ubuntu.com/SoftwareUpdateHandling#Launching)
+    LP: #289404
+
  -- Michael Vogt <[e-mail]>  Wed, 28 Jul 2010 15:18:20 +0200
 
 update-manager (1:0.142.4) maverick; urgency=low

=== modified file 'update-manager'
--- update-manager	2010-04-14 12:34:25 +0000
+++ update-manager	2010-08-03 09:07:43 +0000
@@ -78,6 +78,9 @@
                      # TRANSLATORS: aufs is the name of the filesystem
                      # that is used to create the overlay
                      help=_("Test upgrade with a sandbox aufs overlay"))
+  parser.add_option("--automatic-check", action="store_true",
+                    dest="automatic_check", default=False,
+                    help=_("Automatically check for updates"))
 
   (options, args) = parser.parse_args()