diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | pbuilder-modules | 8 | ||||
| -rwxr-xr-x | pbuilder-satisfydepends-classic | 13 |
4 files changed, 30 insertions, 9 deletions
@@ -1,3 +1,15 @@ +2007-11-07 Junichi Uekawa <dancer@debian.org> + + * pbuilder-satisfydepends-classic: add APTFLAG, which is "-o + APT::Install-Recommends=false" to toggle recommends + installation. This option is ignored by etch apt, so should be + harmless. + + * pbuilder-modules (APT): install Install-Recommends "false" + configuration to /etc/apt/apt.conf.d/15pbuilder. Move + experimental configuration to there from /etc/apt/apt.conf to + /etc/apt/apt.conf.d/15pbuilder. + 2007-10-25 Junichi Uekawa <dancer@debian.org> * pbuilderrc: set default value for COMPONENTS, so that diff --git a/debian/changelog b/debian/changelog index f5fd881..7cb1049 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,12 @@ pbuilder (0.175) UNRELEASED; urgency=low thanks to Soren Hansen (Closes: #448757). * Bug fix: "pbuilder: French documentation translation", thanks to Vincent Bernat (Closes: #448294). + * Bug fix: "pbuilder-satisfydepends-classic should pass + -o APT::Install-Recommends=false to apt-get", thanks to Daniel Schepler + (Closes: #448562). + * set /etc/apt/apt.conf.d/15pbuilder so that Install-Recommends is false. - -- Junichi Uekawa <dancer@debian.org> Tue, 06 Nov 2007 09:05:53 +0900 + -- Junichi Uekawa <dancer@debian.org> Wed, 07 Nov 2007 09:25:50 +0900 pbuilder (0.174) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index 1669038..5838a90 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -316,14 +316,18 @@ EOF echo " -> Copy " "$APTCONFDIR"/* " to chroot" cp -a "$APTCONFDIR/"* "$BUILDPLACE"/etc/apt fi - + + # configure /etc/apt.conf.d/15pbuilder + cat > "$BUILDPLACE"/etc/apt/apt.conf.d/15pbuilder <<EOF +APT::Install-Recommends "false"; +EOF if [ -n "$EXPERIMENTAL" ]; then echo " -> Installing apt-lines and pinning for experimental" if [ -n "$MIRRORSITE" ] ; then echo "deb $MIRRORSITE experimental main" >> "$BUILDPLACE"/etc/apt/sources.list echo "#deb-src $MIRRORSITE experimental main" >> "$BUILDPLACE"/etc/apt/sources.list fi - cat >> "$BUILDPLACE"/etc/apt/apt.conf << EOF + cat >> "$BUILDPLACE"/etc/apt/apt.conf.d/15pbuilder <<EOF APT::Default-Release "experimental"; EOF fi diff --git a/pbuilder-satisfydepends-classic b/pbuilder-satisfydepends-classic index 8a37603..616e414 100755 --- a/pbuilder-satisfydepends-classic +++ b/pbuilder-satisfydepends-classic @@ -33,6 +33,7 @@ function checkbuilddep_internal () { local INSTALLPKGMULTI local CURRENTREALPKGNAME local SATISFIED + local APTFLAG="-o APT::Install-Recommends=false" echo " -> Attempting to parse the build-deps " for INSTALLPKGMULTI in $(get_control_re "$DEBIAN_CONTROL" "$BD_REGEXP" | tr " " "/" | \ @@ -60,12 +61,12 @@ function checkbuilddep_internal () { fi echo " -> Trying $CURRENTREALPKGNAME" - if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $CURRENTREALPKGNAME >& /dev/null; then + if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST $CURRENTREALPKGNAME >& /dev/null; then SATISFIED="yes" INSTALLPKGLIST="$INSTALLPKGLIST $CURRENTREALPKGNAME" else echo " -> Cannot install $CURRENTREALPKGNAME; apt errors follow:" - if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST "$CURRENTREALPKGNAME"; then + if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST "$CURRENTREALPKGNAME"; then : fi # package could not be found. -- looking for alternative. @@ -74,13 +75,13 @@ function checkbuilddep_internal () { if [ -n "$PROVIDED" ]; then # something provides this package echo " -> Considering $PROVIDED to satisfy the dependency " - if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $PROVIDED >& /dev/null; then + if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST $PROVIDED >& /dev/null; then SATISFIED="yes"; INSTALLPKGLIST="$INSTALLPKGLIST $PROVIDED" else # show the error for diagnostic purposes echo " -> Cannot install $PROVIDED; apt errors follow:" - if $CHROOTEXEC /usr/bin/apt-get -s install $INSTALLPKGLIST $PROVIDED; then + if $CHROOTEXEC /usr/bin/apt-get -s install $APTFLAG $INSTALLPKGLIST $PROVIDED; then : fi fi @@ -100,10 +101,10 @@ function checkbuilddep_internal () { # now actually install the packages echo " -> Installing $INSTALLPKGLIST" - if ! $CHROOTEXEC apt-get -y --force-yes install $INSTALLPKGLIST; then + if ! $CHROOTEXEC apt-get -y --force-yes install $APTFLAG $INSTALLPKGLIST; then echo " -> Trying to fix apt error" # Work around an apt bug which causes configure to fail. - if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install $INSTALLPKGLIST; then + if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y --force-yes install $APTFLAG $INSTALLPKGLIST; then echo " -> Apt bug workaround succeeded" elif [ "$CONTINUE_FAIL" != "yes" ]; then echo "E: Unrecoverable error installing build-dependencies." >&2 |