aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2007-11-23 13:54:33 +0100
committerLoïc Minier <lool@dooz.org>2007-11-23 13:54:33 +0100
commit0f73ab01936e61433f94dadb1db79168020e9961 (patch)
tree1be9238f734ba7e34b26422c3c6873af9afa40d7
parentd542672df02a61964bc3d0c4f46216a42a5565c4 (diff)
downloadpbuilder-0f73ab01936e61433f94dadb1db79168020e9961.tar
pbuilder-0f73ab01936e61433f94dadb1db79168020e9961.tar.gz
* pbuilder-satisfydepends-aptitude: Pass -o APT::Install-Recommends=false too
-rw-r--r--ChangeLog6
-rwxr-xr-xpbuilder-satisfydepends-aptitude2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 112dbf2..80851ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-23 Loïc Minier <lool@dooz.org>
+
+ * pbuilder-satisfydepends-aptitude: Pass -o
+ APT::Install-Recommends=false to aptitude as --without-recommends
+ doesn't seem to be enough with the new APT.
+
2007-11-07 Junichi Uekawa <dancer@debian.org>
* testsuite/random-manual-test-material/build-depends-on-experimental/bde_0.1.dsc:
diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude
index f7d59f4..dafdc4f 100755
--- a/pbuilder-satisfydepends-aptitude
+++ b/pbuilder-satisfydepends-aptitude
@@ -86,7 +86,7 @@ EOF
$CHROOTEXEC sh -c "dpkg-deb -b \"$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy\""
$CHROOTEXEC apt-get -y --force-yes install aptitude
$CHROOTEXEC dpkg -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true
- $CHROOTEXEC aptitude -y --without-recommends -o Aptitude::CmdLine::Ignore-Trust-Violations=true -o Aptitude::ProblemResolver::StepScore=100 install pbuilder-satisfydepends-dummy
+ $CHROOTEXEC aptitude -y --without-recommends -o APT::Install-Recommends=false -o Aptitude::CmdLine::Ignore-Trust-Violations=true -o Aptitude::ProblemResolver::StepScore=100 install pbuilder-satisfydepends-dummy
# check whether the aptitude's resolver kept the package
if ! $CHROOTEXEC dpkg -l pbuilder-satisfydepends-dummy 2>/dev/null | grep -q ^ii; then
echo "Aptitude couldn't satisfy the build dependencies"