[Pbuilder-maint] pbuilder CVS update: pbuilder ChangeLog pdebuild-internal

[pbuilder CVS Commit]

  User: lool    
  Date: 06/11/05 22:46:46

  Modified:    .        ChangeLog pdebuild-internal
  Log:
  * Revert to simply installing passwd and not uninstall it.
  
  Revision  Changes    Path
  1.417     +2 -3      pbuilder/ChangeLog
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?annotate=1.417&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/ChangeLog?rev=1.417&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.417&r2=1.416&cvsroot=
  
  -----------------------------------
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/ChangeLog,v
  retrieving revision 1.416
  retrieving revision 1.417
  diff -u -r1.416 -r1.417
  --- ChangeLog	3 Nov 2006 17:45:01 -0000	1.416
  +++ ChangeLog	5 Nov 2006 21:46:46 -0000	1.417
  @@ -1,8 +1,7 @@
   2006-11-03  Loic Minier <lool at dooz.org>
   
   	* pdebuild-internal: install the passwd package before calling
  -	groupadd and useradd; restore it's installation state after groupadd
  -	and useradd.
  +	groupadd and useradd.
   
   2006-10-30  Loic Minier <lool at dooz.org>
   
  
  
  
  1.15      +2 -12     pbuilder/pdebuild-internal
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal?annotate=1.15&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal?rev=1.15&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pbuilder/pbuilder/pdebuild-internal.diff?r1=1.15&r2=1.14&cvsroot=
  
  -----------------------------------
  
  Index: pdebuild-internal
  ===================================================================
  RCS file: /cvsroot/pbuilder/pbuilder/pdebuild-internal,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- pdebuild-internal	3 Nov 2006 17:45:01 -0000	1.14
  +++ pdebuild-internal	5 Nov 2006 21:46:46 -0000	1.15
  @@ -31,7 +31,8 @@
   echo "Using: $Id$"
   
   # I am probably running as root; make sure I have pbuilder installed here.
  -apt-get install -y --force-yes pbuilder 
  +# passwd is needed as well because of useradd and groupadd calls.
  +apt-get install -y --force-yes pbuilder passwd
   
   # I'm not going to have the same LOGNAME as outside, I'm root.
   export LOGNAME=root
  @@ -73,20 +74,9 @@
   /usr/lib/pbuilder/pbuilder-satisfydepends
   apt-get install -y --force-yes fakeroot
   
  -# we will need "passwd" for groupadd/useradd, retain whether it was installed
  -# warning: dpkg --get-selections returns true for unknown packages
  -PASSWD_SELECTION="$(LC_ALL=C dpkg --get-selections passwd && true)"
  -if [ -z "$PASSWD_SELECTION" ]; then
  -    PASSWD_SELECTION="passwd                                          purge"
  -fi
  -# install passwd
  -apt-get install -y --force-yes passwd
   # create the user similar to that used outside
   groupadd -g "${BUILDRESULTGID}" -o pbgroup
   useradd -g pbgroup -u "${BUILDRESULTUID}" -o pbuser
  -# restore the state of the passwd package
  -echo "$PASSWD_SELECTION" | LC_ALL=C dpkg --set-selections
  -apt-get dselect-upgrade -u -y --force-yes
   
   # what about id -G output? if other groups than the designated is used, we're stuffed.