diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | pbuilder-modules | 11 |
3 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,8 @@ +2007-01-04 Junichi Uekawa <dancer@debian.org> + + * pbuilder-modules: Fix the situation where "cowbuilder --update + --override-config --mirror $mirror" fails to clean up. + 2006-12-17 Junichi Uekawa <dancer@debian.org> * pbuilder-createbuildenv: use FORCE_CONFNEW in 'pbuilder create' diff --git a/debian/changelog b/debian/changelog index 32dc13e..c82fc0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ pbuilder (0.163) UNRELEASED; urgency=low - * + [ Junichi Uekawa ] + * --override-config and --mirror without --distribution leaves /proc + mounted, and breaks cowbuilder. (closes: #405497) - -- Junichi Uekawa <dancer@debian.org> Tue, 26 Dec 2006 17:12:56 +0900 + -- Junichi Uekawa <dancer@debian.org> Thu, 4 Jan 2007 15:20:20 +0900 pbuilder (0.162) unstable; urgency=low diff --git a/pbuilder-modules b/pbuilder-modules index 654d8c1..309bf8e 100644 --- a/pbuilder-modules +++ b/pbuilder-modules @@ -338,7 +338,8 @@ function copy_local_configuration () { function extractbuildplace () { # after calling this function, umountproc, and cleanbuildplace - # needs to be called. Please trap it. + # needs to be called. Please trap it after calling this function. + if [ "${INTERNAL_BUILD_UML}" != "yes" -a ! \( "${PRESERVE_BUILDPLACE}" = "yes" -a -d "$BUILDPLACE" \) ]; then cleanbuildplace echo "Building the build Environment" @@ -359,12 +360,14 @@ function extractbuildplace () { hostname -f > "$BUILDPLACE/etc/mailname" fi copy_local_configuration - mountproc - mkdir -p "$BUILDPLACE/tmp/buildd" - + + # installaptlines may fail with exit 1, do it earlier than mountproc. if [ "$OVERRIDE_APTLINES" = "yes" ]; then installaptlines fi + + mountproc + mkdir -p "$BUILDPLACE/tmp/buildd" } |