From 726e6192e049c65b28e5c611cb65b710dbc403f9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 23 Jun 2017 14:23:53 -0400 Subject: [PATCH] auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down dependency bugs in the livefs is a little clearer. --- debian/changelog | 5 +++++ live-build/auto/config | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 14911ab2..08ff8068 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ livecd-rootfs (2.448) UNRELEASED; urgency=medium + [ Balint Reczey ] * Depend on packages in main instead of installing them at runtime * Depend on pxz and vmdk-stream-converter instead of installing them at run time + [ Mathieu Trudel-Lapierre ] + * auto/config: enable Debug::pkgDepCache::AutoInstall so tracking down + dependency bugs in the livefs is a little clearer. + -- Balint Reczey Wed, 14 Jun 2017 18:25:32 +0200 livecd-rootfs (2.447) artful; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index ba0033f7..3f504463 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -94,6 +94,8 @@ PREINSTALL_POOL_SEEDS= CHROOT_HOOKS= BINARY_HOOKS= +APT_OPTIONS=" --yes -oDebug::pkgDepCache::AutoInstall=yes " + add_chroot_hook () { CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1" @@ -343,7 +345,7 @@ case $PROJECT in # The Lubuntu STRUCTURE file has "feature # no-follow-recommends". Mirror this. - export APT_OPTIONS="--yes --no-install-recommends" + APT_OPTIONS="${APT_OPTIONS} --no-install-recommends" ;; lubuntu-next) @@ -359,7 +361,7 @@ case $PROJECT in # The Lubuntu STRUCTURE file has "feature # no-follow-recommends". Mirror this. - export APT_OPTIONS="--yes --no-install-recommends" + APT_OPTIONS="${APT_OPTIONS} --no-install-recommends" ;; ubuntu-gnome) @@ -557,6 +559,8 @@ case $PROJECT in ;; esac +export APT_OPTIONS + if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi