[Pbuilder-maint] pbuilder CVS update: pbuilder pbuilder-modules ChangeLog

[pbuilder CVS Commit]

  User: dancer  
  Date: 07/01/04 07:22:20

  Modified:    .        pbuilder-modules ChangeLog
  Log:
    * --override-config and --mirror without --distribution leaves /proc
      mounted, and breaks cowbuilder. (closes: #405497)
  
  Revision  Changes    Path
  1.104     +7 -4      pbuilder/pbuilder-modules
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?annotate=1.104&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules?rev=1.104&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-modules.diff?r1=1.104&r2=1.103&cvsroot=
  
  -----------------------------------
  
  Index: pbuilder-modules
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-modules,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- pbuilder-modules	6 Nov 2006 20:06:25 -0000	1.103
  +++ pbuilder-modules	4 Jan 2007 06:22:19 -0000	1.104
  @@ -338,7 +338,8 @@
   
   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 @@
   	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"
   }
   
   
  
  
  
  1.427     +6 -1      pbuilder/ChangeLog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.427&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.427&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog.diff?r1=1.427&r2=1.426&cvsroot=
  
  -----------------------------------
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
  retrieving revision 1.426
  retrieving revision 1.427
  diff -u -r1.426 -r1.427
  --- ChangeLog	17 Dec 2006 02:10:29 -0000	1.426
  +++ ChangeLog	4 Jan 2007 06:22:19 -0000	1.427
  @@ -1,3 +1,8 @@
  +2007-01-04  Junichi Uekawa  <dancer at debian.org>
  +
  +	* pbuilder-modules: Fix the situation where "cowbuilder --update
  +	--override-config --mirror $mirror" fails to clean up.
  +
   2006-12-17  Junichi Uekawa  <dancer at debian.org>
   
   	* pbuilder-createbuildenv: use FORCE_CONFNEW in 'pbuilder create'