Merge lp:~barry/ubuntu-system-image/snappy-lp1412698 into lp:~snappy-dev/ubuntu-system-image/ppa-upload

[Barry Warsaw]

system-image (2.5-0ubuntu1+ppa16) UNRELEASED; urgency=medium

  * Invalidate the update cache and release the checking lock if acquired,
    when the D-Bus method ReloadConfiguration() is called. This ensures
    that another full check will be performed. (LP: #1412698)

 -- Barry Warsaw <email address hidden> Tue, 20 Jan 2015 11:06:51 -0500

[Michael Vogt (mvo)]

Thanks, LGTM!

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-14 23:39:42 +0000
+++ debian/changelog	2015-01-20 17:10:06 +0000
@@ -1,3 +1,11 @@
+system-image (2.5-0ubuntu1+ppa16) UNRELEASED; urgency=medium
+
+  * Invalidate the update cache and release the checking lock if acquired,
+    when the D-Bus method ReloadConfiguration() is called.  This ensures
+    that another full check will be performed.   (LP: #1412698)
+
+ -- Barry Warsaw <[e-mail]>  Tue, 20 Jan 2015 11:06:51 -0500
+
 system-image (2.5-0ubuntu1+ppa15) vivid; urgency=medium
 
   [ Barry Warsaw ]

=== modified file 'systemimage/dbus.py'
--- systemimage/dbus.py	2015-01-14 21:47:31 +0000
+++ systemimage/dbus.py	2015-01-20 17:10:06 +0000
@@ -416,6 +416,14 @@
             config.load(path)
         except OSError as error:
             return str(error)
+        # Invalidate the update cache and release the checking lock if
+        # acquired.  It's fine if the lock is not acquired; it just means that
+        # no previous CheckForUpdate was called.
+        self._update = None
+        try:
+            self._checking.release()
+        except RuntimeError:
+            pass
         try:
             # This can legitimately fail if there's no channel.ini file.
             channel_ini = os.path.join(

=== modified file 'systemimage/tests/test_dbus.py'
--- systemimage/tests/test_dbus.py	2015-01-14 21:38:17 +0000
+++ systemimage/tests/test_dbus.py	2015-01-20 17:10:06 +0000
@@ -1962,3 +1962,23 @@
             self.assertEqual(status, '')
             response = self.iface.Information()
             self.assertEqual(response['current_build_number'], '1833')
+
+    def test_check_for_update_after_reload(self):
+        # LP: #1412698 - Do a CheckForUpdate while in manual download mode,
+        # which acquires the checking lock.  Then ReloadConfiguration and issue
+        # another CFU.  The second one will never send the UAS because the
+        # checking lock will not be released, until mvo's patch in that bug
+        # explicitly releases the lock.  It doesn't even matter if it actually
+        # uses a second partition.
+        self.download_manually()
+        reactor = SignalCapturingReactor('UpdateAvailableStatus')
+        reactor.run(self.iface.CheckForUpdate)
+        self.assertEqual(len(reactor.signals), 1)
+        self.assertTrue(reactor.signals[0].is_available)
+        status = self.iface.ReloadConfiguration(
+            SystemImagePlugin.controller.ini_path)
+        self.assertEqual(status, '')
+        reactor = SignalCapturingReactor('UpdateAvailableStatus')
+        reactor.run(self.iface.CheckForUpdate)
+        self.assertEqual(len(reactor.signals), 1)
+        self.assertTrue(reactor.signals[0].is_available)