Merge lp:~mterry/update-notifier/pkexec into lp:update-notifier/ubuntu

[Michael Terry]

Finally drops gksu from the default install. Last holdout was backend_helper.py which used it for synaptic. But synaptic ships synaptic-pkexec which is a good replacement.

The last user of gksu is in cddistupgrader. But that only pulls gksu in as a Suggests on update-notifier-common. So if that Suggests is really the appropriate level, that means update-notifier won't be responsible for pulling it onto the image anyway.

[Colin Watson (cjwatson)]

> -GKSU = ["/usr/bin/gksu"]
> -SYNPATIC_DESKTOP = ["--desktop",
> - "/usr/share/applications/synaptic.desktop",
> - "--"]
> +SUDO = ["/usr/bin/pkexec"]

If you're renaming the variable, call it PKEXEC, please, or at least
something that isn't the name of another tool. It's rather confusing
otherwise.

> === modified file 'data/cddistupgrader'
> --- data/cddistupgrader 2013-01-31 14:13:55 +0000
> +++ data/cddistupgrader 2013-01-31 23:13:25 +0000
> @@ -28,4 +28,4 @@
> done
>
> # run it
> -gksu -- "$TMPDIR"/"$CODENAME" --cdrom "$CDROM_MOUNT"
> +pkexec "$TMPDIR"/"$CODENAME" --cdrom "$CDROM_MOUNT"

I don't think this works for cddistupgrader, because the upgrader is
going to want to talk to the X server and pkexec doesn't allow that by
default.

I was considering shipping a polkit action file for cddistupgrader
itself and executing the whole lot under pkexec, which might be simpler
to arrange ...

[Michael Terry (mterry)]

Sorry, Colin. I uploaded a bad version, which you reviewed. Try the new one (I bzr --overwrote). It should address your concerns.

[Colin Watson (cjwatson)]

While you're right that the Depends is technically in the wrong place, in practice lots of the relevant images have update-notifier installed as well as update-notifier-common, thereby causing cddistupgrader to work. Do you think you could allay any regression concerns by implementing my suggestion for cddistupgrader?

The backend_helper change indeed looks better now.

[Michael Terry (mterry)]

Yeah, sure.

[Michael Terry (mterry)]

Updated!

[lp:~mterry/update-notifier/pkexec]

770. By Michael Terry on 2013-02-01

merge from trunk

[Colin Watson (cjwatson)]

Looks good to me now. Thanks!

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-05-14 22:31:36 +0000
+++ data/Makefile.am	2013-02-01 15:19:27 +0000
@@ -8,6 +8,10 @@
 @GSETTINGS_RULES@
 gsettings_SCHEMAS = com.ubuntu.update-notifier.gschema.xml
 
+@INTLTOOL_POLICY_RULE@
+policydir = $(datadir)/polkit-1/actions
+policy_DATA = com.ubuntu.update-notifier.policy
+
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = update-notifier.convert
 
@@ -22,7 +26,8 @@
 EXTRA_DIST= $(helper_SCRIPTS) \
 	    $(desktop_in_files) \
 	    $(notify_in_files) \
-	    $(gsettings_SCHEMAS:.xml=.xml.in)
+	    $(gsettings_SCHEMAS:.xml=.xml.in) \
+	    $(policy_DATA:.policy=.policy.in)
 
 CLEANFILES = \
 	    $(gsettings_SCHEMAS) \

=== modified file 'data/backend_helper.py'
--- data/backend_helper.py	2012-09-06 18:54:58 +0000
+++ data/backend_helper.py	2013-02-01 15:19:27 +0000
@@ -7,10 +7,6 @@
 import subprocess
 import sys
 
-GKSU = ["/usr/bin/gksu"]
-SYNPATIC_DESKTOP = ["--desktop", 
-                    "/usr/share/applications/synaptic.desktop", 
-                    "--"]
 HAVE_APTDAEMON = False
 try:
     import aptdaemon.gtk3widgets
@@ -39,13 +35,13 @@
     Gtk.main()
     return trans.exit == enums.EXIT_SUCCESS
     
-def _install_all_updates_gksu():
-    cmd = GKSU + SYNPATIC_DESKTOP + [ "/usr/sbin/synaptic ",
-                                      "--dist-upgrade-mode",
-                                      "--non-interactive",
-                                      "--hide-main-window",
-                                      "-o", "Synaptic::AskRelated=true",
-                                      ]
+def _install_all_updates_synaptic():
+    cmd = [ "/usr/bin/synaptic-pkexec",
+            "--dist-upgrade-mode",
+            "--non-interactive",
+            "--hide-main-window",
+            "-o", "Synaptic::AskRelated=true",
+            ]
     return subprocess.call(cmd)
 
 def install_all_updates():
@@ -53,7 +49,7 @@
     if HAVE_APTDAEMON:
         return _install_all_updates_aptdaemon()
     else:
-        return _install_all_updates_gksu()
+        return _install_all_updates_synaptic()
 
 
 # check updates
@@ -70,11 +66,11 @@
     return trans.exit == enums.EXIT_SUCCESS
 
 def _check_updates_gtk():
-    cmd = GKSU + SYNPATIC_DESKTOP + ["/usr/sbin/synaptic",
-                                     "--update-at-startup",
-                                     "--non-interactive",
-                                     "--hide-main-window",
-                                     ]
+    cmd = ["/usr/bin/synaptic-pkexec",
+           "--update-at-startup",
+           "--non-interactive",
+           "--hide-main-window",
+           ]
     subprocess.call(cmd)
 
 def check_updates():
@@ -87,8 +83,8 @@
 
 # start packagemanager
 def start_packagemanager():
-    if os.path.exists("/usr/sbin/synaptic"):
-        cmd = GKSU + SYNPATIC_DESKTOP + ["/usr/sbin/synaptic"]
+    if os.path.exists("/usr/bin/synaptic-pkexec"):
+        cmd = ["/usr/bin/synaptic-pkexec"]
         return subprocess.call(cmd)
     elif os.path.exists("/usr/bin/software-center"):
         return subprocess.call(["/usr/bin/software-center"])
@@ -117,7 +113,7 @@
     return subprocess.call(cmd)
 
 def add_cdrom(mount_path):
-    if os.path.exists("/usr/sbin/synaptic"):
+    if os.path.exists("/usr/bin/synaptic-pkexec"):
         _add_cdrom_synaptic(mount_path)
     else:
         _add_cdrom_sp(mount_path)

=== modified file 'data/cddistupgrader'
--- data/cddistupgrader	2013-01-31 14:13:55 +0000
+++ data/cddistupgrader	2013-02-01 15:19:27 +0000
@@ -28,4 +28,4 @@
 done
 
 # run it
-gksu -- "$TMPDIR"/"$CODENAME" --cdrom "$CDROM_MOUNT"
+"$TMPDIR"/"$CODENAME" --cdrom "$CDROM_MOUNT"

=== added file 'data/com.ubuntu.update-notifier.policy.in'
--- data/com.ubuntu.update-notifier.policy.in	1970-01-01 00:00:00 +0000
+++ data/com.ubuntu.update-notifier.policy.in	2013-02-01 15:19:27 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="com.ubuntu.update-notifier.pkexec.cddistupgrader">
+    <_message>Authentication is needed to upgrade</_message>
+    <icon_name>update-notifier</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/lib/update-notifier/cddistupgrader</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-01 15:12:08 +0000
+++ debian/changelog	2013-02-01 15:19:27 +0000
@@ -1,3 +1,11 @@
+update-notifier (0.132) UNRELEASED; urgency=low
+
+  * Use synaptic-pkexec instead of gksu in backend_helper.py
+  * Install a policykit policy file to replace last gksu use for
+    cddistupgrader.
+
+ -- Michael Terry <[e-mail]>  Fri, 01 Feb 2013 10:17:35 -0500
+
 update-notifier (0.131) raring; urgency=low
 
   * Remove obsolete and unused data/dbus-helper.

=== modified file 'debian/control'
--- debian/control	2013-02-01 00:51:16 +0000
+++ debian/control	2013-02-01 15:19:27 +0000
@@ -30,10 +30,9 @@
          update-manager-gnome | update-manager (>= 1:0.165),
          ubuntu-release-upgrader-gtk,
          notification-daemon,
-         gksu,
          policykit-1
 Recommends: apport-gtk (>=2.8-0ubuntu3), 
-            python-aptdaemon.gtk3widgets | synaptic, 
+            python-aptdaemon.gtk3widgets | synaptic (>= 0.75.12), 
             software-properties-gtk, 
             anacron, 
             python-aptdaemon
@@ -51,7 +50,7 @@
          python,
          python-apt (>= 0.6.12), python-debian, debconf, patch
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
-Suggests: gksu, policykit-1
+Suggests: policykit-1
 Description: Files shared between update-notifier and other packages
  Apt setup files and reboot notification scripts shared between
  update-notifier and other packages, notably for server use cases.

=== modified file 'debian/update-notifier-common.install'
--- debian/update-notifier-common.install	2012-03-22 18:51:22 +0000
+++ debian/update-notifier-common.install	2013-02-01 15:19:27 +0000
@@ -5,6 +5,7 @@
 debian/90-updates-available etc/update-motd.d
 debian/98-reboot-required etc/update-motd.d
 debian/98-fsck-at-reboot etc/update-motd.d
+usr/share/polkit-1/actions/com.ubuntu.update-notifier.policy
 usr/share/update-notifier/notify-reboot-required
 usr/share/update-notifier/package-data-downloads-failed
 usr/share/update-notifier/package-data-downloads-failed-permanently

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-07-23 17:35:22 +0000
+++ po/POTFILES.in	2013-02-01 15:19:27 +0000
@@ -16,6 +16,7 @@
 [type: gettext/glade]ui/hooks-dialog.ui
 [type: gettext/glade]ui/reboot-dialog.ui
 data/com.ubuntu.update-notifier.gschema.xml.in
+data/com.ubuntu.update-notifier.policy.in
 data/update-notifier.desktop.in
 [type: gettext/rfc822deb] data/package-data-downloads-failed.in
 [type: gettext/rfc822deb] data/package-data-downloads-failed-permanently.in

=== modified file 'src/cdroms.c'
--- src/cdroms.c	2013-01-31 00:46:48 +0000
+++ src/cdroms.c	2013-02-01 15:19:27 +0000
@@ -111,9 +111,10 @@
       g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
       break;
    case RES_DIST_UPGRADER:
-      argv[0] = "/usr/lib/update-notifier/cddistupgrader";
-      argv[1] = (gchar *)mount_point;
-      argv[2] = NULL;
+      argv[0] = "/usr/bin/pkexec";
+      argv[1] = "/usr/lib/update-notifier/cddistupgrader";
+      argv[2] = (gchar *)mount_point;
+      argv[3] = NULL;
       g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL);
       break;
    default: