From 207a9d23955bd4b4ce63e50d96325d4278a70299 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 16 May 2014 13:05:07 +0100 Subject: [PATCH] Import patches-unapplied version 2.210 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: 9ee4945699c0bdedde913d6ee34c026618d30319 New changelog entries: * live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot: Fix test for whether a package is installed, and check for both python-autopilot and python3-autopilot. --- debian/changelog | 8 ++++++++ .../ubuntu-touch/hooks/70-reconfigure-autopilot.chroot | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 021df2bd..929a4a38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.210) utopic; urgency=medium + + * live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot: Fix test + for whether a package is installed, and check for both python-autopilot + and python3-autopilot. + + -- Colin Watson Fri, 16 May 2014 13:05:07 +0100 + livecd-rootfs (2.209) utopic; urgency=medium * live-build/auto/config: Pass any additional command-line arguments on to diff --git a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot index 0e28394e..296fec0f 100644 --- a/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot +++ b/live-build/ubuntu-touch/hooks/70-reconfigure-autopilot.chroot @@ -7,4 +7,10 @@ echo "making sure phablet user is in the autopilot group" -dpkg -l python-autopilot >/dev/null 2>&1 && dpkg-reconfigure python-autopilot +for pkg in python-autopilot python3-autopilot; do + if dpkg-query -W -f '${Status}\n' "$pkg" 2>/dev/null | \ + grep -q ' installed$'; then + dpkg-reconfigure "$pkg" + break + fi +done