Merge lp:~mvo/aptdaemon/use-glib-unix-signal-handling into lp:aptdaemon

[Michael Vogt]

Use glib unix signal handling

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2012-11-26 10:29:31 +0000
+++ aptdaemon/core.py	2012-11-28 11:26:21 +0000
@@ -1395,8 +1395,11 @@
         bus -- the D-Bus to connect to (defaults to the system bus)
         """
         log.info("Initializing daemon")
-        signal.signal(signal.SIGQUIT, self._sigquit)
-        signal.signal(signal.SIGTERM, self._sigquit)
+        # glib does not support SIGQUIT
+        #GLib.unix_signal_add_full(
+        #    GLib.PRIORITY_HIGH, signal.SIGQUIT, self._sigquit, None)
+        GLib.unix_signal_add_full(
+            GLib.PRIORITY_HIGH, signal.SIGTERM, self._sigquit, None)
         # Decrease the priority of the daemon to avoid blocking UI
         os.nice(5)
         self.options = options
@@ -2148,7 +2151,7 @@
         else:
             return {}
 
-    def _sigquit(self, signum, frame):
+    def _sigquit(self, data):
         """Internal callback for the quit signal."""
         self.Quit(None)