From 1cf0868b7ab0115b03e59825be830f8db8b09cd2 Mon Sep 17 00:00:00 2001
From: Junichi Uekawa <dancer@dancer64.netfort.gr.jp>
Date: Wed, 7 Nov 2007 09:36:23 +0900
Subject: * 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.

---
 pbuilder-satisfydepends-classic | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'pbuilder-satisfydepends-classic')

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
-- 
cgit v1.2.3