aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordancer <dancer>2003-09-21 22:25:57 +0000
committerdancer <dancer>2003-09-21 22:25:57 +0000
commit5f48167b4872cbc4bf128a7c1b82fb52d23d7d46 (patch)
tree71296c10103bc1435c981e8a1943788faf946c44
parent2a3d6c26a36f76676ee3bda9ab775caf12f2fb89 (diff)
downloadpbuilder-5f48167b4872cbc4bf128a7c1b82fb52d23d7d46.tar
pbuilder-5f48167b4872cbc4bf128a7c1b82fb52d23d7d46.tar.gz
+ * Bug fix: "pdebuild continues after source package fails to build",
+ thanks to Matt Kraai (Closes: #211108).
-rw-r--r--ChangeLog2
-rw-r--r--debian/changelog5
-rw-r--r--pdebuild2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c07d1fb..44cc293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2003-09-22 Junichi Uekawa <dancer@debian.org>
+ * pdebuild (ARCHITECTURE): do not || true for dpkg-buildpackage -S.
+
* testsuite/run-test.sh (PBUILDER_UML): update script to test both sid and sarge.
2003-09-19 Junichi Uekawa <dancer@debian.org>
diff --git a/debian/changelog b/debian/changelog
index fa33ec7..9dd9db4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
pbuilder (0.87) UNRELEASED; urgency=low
- * Test
+ * Bug fix: "pdebuild continues after source package fails to build",
+ thanks to Matt Kraai (Closes: #211108).
- -- Junichi Uekawa <dancer@debian.org> Fri, 19 Sep 2003 06:07:39 +0900
+ -- Junichi Uekawa <dancer@debian.org> Mon, 22 Sep 2003 07:27:28 +0900
pbuilder (0.86) unstable; urgency=low
diff --git a/pdebuild b/pdebuild
index c9ad9e8..ce525c7 100644
--- a/pdebuild
+++ b/pdebuild
@@ -33,7 +33,7 @@ PKG_SOURCENAME=$(dpkg-parsechangelog|sed -n 's/^Source: //p')
PKG_VERSION=$(dpkg-parsechangelog|sed -n 's/^Version: \(.*:\|\)//p')
ARCHITECTURE=$(dpkg-architecture -qDEB_HOST_ARCH)
-dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD} || true
+dpkg-buildpackage -S -us -uc -r${BUILDSOURCEROOTCMD}
${PBUILDERROOTCMD} pbuilder build "$@" --buildresult "${BUILDRESULT}" ../"${PKG_SOURCENAME}_${PKG_VERSION}".dsc
if [ "${AUTO_DEBSIGN}" = "yes" ]; then
debsign "${BUILDRESULT}/${PKG_SOURCENAME}_${PKG_VERSION}_${ARCHITECTURE}.changes"