aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattia Rizzolo <mattia@mapreri.org>2015-10-05 22:31:57 +0000
committerMattia Rizzolo <mattia@mapreri.org>2015-10-05 22:31:57 +0000
commite827f5094ed4b833cfc1c06c736c130521d6d226 (patch)
tree7f8336dd65237b38aaff1581ba6c307ba60961ee
parentf545a18ccde29cac917e61a0669844ca0eabea63 (diff)
downloadpbuilder-e827f5094ed4b833cfc1c06c736c130521d6d226.tar
pbuilder-e827f5094ed4b833cfc1c06c736c130521d6d226.tar.gz
updatebuildenv: also explicitely install 2 de-facto dependencies of debdelta which are only in recommends
Those 2 are real deps, as debdelta-upgrade won't work without them, though the maintainer thinks otherwise: https://bugs.debian.org/545831 Install them manually (since using --install-recommends would install way too much stuff), and then mark them as automatically installed, so they will be removed by the `apt-get autoremove` thing once debdelta's gone (but won't before because debdelta references them someway). Gbp-Dch: Ignore
-rwxr-xr-xpbuilder-updatebuildenv7
1 files changed, 6 insertions, 1 deletions
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 4f5a292..4171da1 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -59,7 +59,7 @@ else
fi
if [ "$DEBDELTA" = "yes" ]; then
- EXTRAPACKAGES="$EXTRAPACKAGES debdelta"
+ EXTRAPACKAGES="$EXTRAPACKAGES debdelta python-apt xdelta3"
else
EXTRAPACKAGES="$EXTRAPACKAGES debdelta-"
fi
@@ -96,6 +96,11 @@ $CHROOTEXEC /usr/bin/apt-get -q -y "${APTGETOPT[@]}" install \
build-essential \
dpkg-dev \
$EXTRAPACKAGES
+# debdelta dependencies are broken (#545831)
+if [ "$DEBDELTA" = "yes" ]; then
+ $CHROOTEXEC apt-mark auto python-apt xdelta3
+fi
+
save_aptcache
add_additional_aptkeyrings