Merge lp:~mvo/aptdaemon/reboot-required-property into lp:aptdaemon

[Michael Vogt]

This adds a reboot required property to aptdaemon so that tools like the indicators can
watch for a reboot required property change signal.

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2011-06-27 08:11:41 +0000
+++ aptdaemon/core.py	2011-07-28 12:03:27 +0000
@@ -1274,11 +1274,18 @@
             self.worker = AptWorker(options.chroot)
         self.queue = TransactionQueue(self.worker)
         self.queue.connect("queue-changed", self._on_queue_changed)
+        # keep state of the last information about reboot required
+        self._reboot_required = self._get_is_reboot_required()
         log.debug("Setting up worker thread")
         log.debug("Daemon was initialized")
 
     def _on_queue_changed(self, queue):
         """Callback for a changed transaction queue."""
+        # check for reboot required
+        if self._get_is_reboot_required() != self._reboot_required:
+            self._reboot_required = self._get_is_reboot_required()
+            self.PropertyChanged("RebootRequired", self._reboot_required)
+        # check for the queue
         if self.queue.worker.trans:
             current = self.queue.worker.trans.tid
         else:
@@ -1886,6 +1893,9 @@
         with open(_POPCON_PATH, "w") as conf_file:
             conf_file.write(config)
 
+    def _get_is_reboot_required(self):
+        return os.path.exists("/var/run/reboot-required")
+        
     def _get_popcon_participation(self):
         #FIXME: Use a script to evaluate the configuration:
         #       #!/bin/sh
@@ -1920,7 +1930,9 @@
                                               "Unattended-Upgrade",
                                               False)),
                     "PopConParticipation": dbus.Boolean(
-                        self._get_popcon_participation())
+                        self._get_popcon_participation()),
+                    "RebootRequired": dbus.Boolean(
+                        self._get_is_reboot_required())
                      }
         else:
             return {}

=== modified file 'doc/source/dbus.rst'
--- doc/source/dbus.rst	2011-06-27 08:11:41 +0000
+++ doc/source/dbus.rst	2011-07-28 12:03:27 +0000
@@ -112,6 +112,12 @@
 
     *writable*
 
+.. attribute:: RebootRequired : b
+
+   Set if a reboot is required in order to complete the update.
+
+    *readonly*
+
 
 org.debian.apt.transaction --- The transaction interface
 --------------------------------------------------------