[Pbuilder-maint] pbuilder CVS update: pbuilder pbuilder-buildpackage

[pbuilder CVS Commit]

  User: dancer  
  Date: 06/01/06 12:30:51

  Modified:    .        pbuilder-buildpackage
  Log:
  344958 fix was incomplete, re-fix.
  
  Revision  Changes    Path
  1.120     +5 -4      pbuilder/pbuilder-buildpackage
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?annotate=1.120&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage?rev=1.120&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pbuilder-buildpackage.diff?r1=1.120&r2=1.119&cvsroot=
  
  -----------------------------------
  
  Index: pbuilder-buildpackage
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/pbuilder-buildpackage,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- pbuilder-buildpackage	6 Jan 2006 12:20:09 -0000	1.119
  +++ pbuilder-buildpackage	6 Jan 2006 12:30:51 -0000	1.120
  @@ -138,10 +138,11 @@
   trap cleanbuildplace exit
   umountproc
   
  +BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
  +BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
  +
   if [ -d "${BUILDRESULT}" ]; then
  -    BUILDRESULTUID="${BUILDRESULTUID:-${SUDO_UID:-0}}"
       chown "${BUILDRESULTUID}:${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
  -    BUILDRESULTGID="${BUILDRESULTGID:-${SUDO_GID:-0}}"
       chgrp "${BUILDRESULTGID}" "${BUILDPLACE}"/tmp/buildd/*
       cp -p "${BUILDPLACE}"/tmp/buildd/* "${BUILDRESULT}" 2>/dev/null || true
   else