=== modified file 'boottest.sh'
--- boottest.sh 2015-08-20 16:18:48 +0000
+++ boottest.sh 2015-09-24 10:00:45 +0000
@@ -1,5 +1,5 @@
#!/bin/bash
-set -e
+set -ex
# Where am I ?
BASEDIR=$(dirname $(readlink -f $0))
@@ -152,7 +152,7 @@
echo "(apt-get update || (sleep 15; apt-get update))" >> adt-commands
# We need dctrl-tools installed so we can use grep-aptavail below
echo "apt-get install -f dctrl-tools" >> adt-commands
-echo 'dpkg-query -f "\${binary:Package}\n" -W | sed -e "s/:.*$//" > installed.packages' >> adt-commands
+echo 'dpkg-query -f "\${binary:Package}\n" -W | sed -e "s/:.*$//" | sort | uniq > installed.packages' >> adt-commands
# Source can be "Source: ${SRC_PKG_NAME} (${version})" so use a regex to grep
# for all packages that exactly match the SRC_PKG_NAME with or without the
# extra version bit.
@@ -177,7 +177,7 @@
fi
# Include '-y' in the list of apt-get options because the updated package
# under test could pull in new dependencies.
-echo 'cat needs_install.packages | xargs apt-get install -f -y -t ${release}-proposed 2> apt-get-install.stderr' >> adt-commands
+echo 'cat needs_install.packages | xargs apt-get install -f -y ubuntu-touch 2> apt-get-install.stderr' >> adt-commands
# The sourcepkg-version file contains the version of the first binary in the
# list of binaries to install. This version data is passed back to britney
# via the final .result file. Britney uses this to determine if the package