aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xpbuilder-satisfydepends-aptitude5
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a4554ad..c889b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-02 Loic Minier <lool@dooz.org>
+
+ * pbuilder-satisfydepends-aptitude: check whether the dummy
+ dependencies package was truly installed or error out; catches
+ situation where "aptitude" did not keep the dummy package but claimed
+ the installation was successful.
+
2007-04-01 Loic Minier <lool@dooz.org>
* pbuilder-satisfydepends*:
diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude
index 6f94d74..14d50de 100755
--- a/pbuilder-satisfydepends-aptitude
+++ b/pbuilder-satisfydepends-aptitude
@@ -87,6 +87,11 @@ EOF
$CHROOTEXEC apt-get -y --force-yes install aptitude
$CHROOTEXEC dpkg -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true
$CHROOTEXEC aptitude -y 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"
+ exit 1
+ fi
echo " -> Finished parsing the build-deps"
}