+2003-09-04 Junichi Uekawa <dancer@debian.org>

+
+	* pbuilder-modules: fix typo in file existence checking.
+
+	* debian/TODO:  how about passing "-o dpkg::Options=--force-confnew" to apt? is now done.
+	Request from Roland Stigge <ernie@atari.antcom.de>
+	to finally implement the missing feature.
+
+	* pbuilder-checkparams: set FORCE_CONFNEW array variable if
+	DEBIAN_FRONTEND is noninteractive to allow non-interactive install.
+
+	* pbuilder-updatebuildenv: use FORCE_CONFNEW variable to
+	give force-confnew option to DPKG
+

6 files changed, 32 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index dcc60f2..87d050b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-09-04  Junichi Uekawa  <dancer@debian.org>
+
+	* pbuilder-modules: fix typo in file existence checking.
+
+	* debian/TODO:  how about passing "-o dpkg::Options=--force-confnew" to apt? is now done.
+	Request from Roland Stigge <ernie@atari.antcom.de>
+	to finally implement the missing feature.
+
+	* pbuilder-checkparams: set FORCE_CONFNEW array variable if 
+	DEBIAN_FRONTEND is noninteractive to allow non-interactive install.
+
+	* pbuilder-updatebuildenv: use FORCE_CONFNEW variable to 
+	give force-confnew option to DPKG
+
 2003-09-02  Junichi Uekawa  <dancer@debian.org>
 
 	* pbuilder-modules: check if etc/hosts etc. exists before trying to 
diff --git a/debian/TODO b/debian/TODO
index d423166..11e420a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -2,7 +2,9 @@ TODO and possible bugs:
 
 * BUG: Too many options! Creeping featurism!!
 
-* Fix pbuilder-user-mode-linux bind-mount, it probably needs to be done via hostfs for better performance, and space-handling in shell.
+* Fix pbuilder-user-mode-linux bind-mount, 
+   -  Use hostfs for better performance, 
+   -  fix space-handling in, use arrays
 
 * Build dependency handles |, but not when [] and | exist. -- no package should be using it ?
 
@@ -19,12 +21,13 @@ TODO and possible bugs:
    - putting example scripts.
          
 * Supporting really automatic/noninteractive "pbuilder upgrade"
-   - how about passing "-o dpkg::Options=--force-confnew" to apt? and also making "start-stop-daemon" to be a dummy script?  (shouldn't be necessary because the config files won't be overwritten?).
+   - making "start-stop-daemon" to be a dummy script?
    - using policy-rc.d ? Get people to use invoke-rc.d?
    - Killing any processes that are left over ? 
    - user-mode-linux is noninteractive, it no longer umounts.
 
 * $HOME, $TMP, $TMPDIR, etc. environment vars are set to bogus values
+* set LOGNAME=root ?
 
 * check cross-compile support, maybe adding support for dpkg-cross into build-depends checker?
 
diff --git a/debian/changelog b/debian/changelog
index 4ddd297..a122b57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-pbuilder (0.86) UNRELEASED; urgency=low
+pbuilder (0.86) unstable; urgency=low
 
   * check if /etc/hosts etc. exist before trying to readlink and cp.
+  * Use force-confnew option of dpkg to make upgrade noninteractive
+    if DEBIAN_FRONTEND=noninteractive. (closes: #208602)
 
- -- Junichi Uekawa <dancer@debian.org>  Tue,  2 Sep 2003 22:02:46 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Thu,  4 Sep 2003 08:07:32 +0900
 
 pbuilder (0.85) unstable; urgency=low
 
diff --git a/pbuilder-checkparams b/pbuilder-checkparams
index 7ff2062..f29d958 100755
--- a/pbuilder-checkparams
+++ b/pbuilder-checkparams
@@ -201,6 +201,12 @@ case "$PBCURRENTCOMMANDLINEOPERATION" in
 # line from kobras@debian.org
 	if [ "$DEBIAN_FRONTEND" = "noninteractive" -o "$DEBIAN_FRONTEND" = "Noninteractive" ]; then
 	    exec < /dev/null
+
+	    # set variables used in the upgrade option.
+	    FORCE_CONFNEW[0]='-o'
+	    FORCE_CONFNEW[1]='DPkg::Options::=--force-confnew'
+	else
+	    unset FORCE_CONFNEW
 	fi
 	;;
 esac
diff --git a/pbuilder-modules b/pbuilder-modules
index 2eea12e..7f7f821 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -205,7 +205,7 @@ function copy_local_configuration () {
     echo " -> copying local configuration"
     for a in hosts hostname resolv.conf; do 
 	rm -f "$BUILDPLACE/etc/$a"
-	if [ -f readlink -f "/etc/$a" ]; then
+	if [ ! -f "/etc/$a" ]; then
 	    echo "E: /etc/$a does not exist, your setup is insane. fix it" >&2
 	fi
 	cp $( readlink -f "/etc/$a" ) "$BUILDPLACE/etc/$a";
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index a2f70ae..2566459 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -37,7 +37,8 @@ if [ -n "$REMOVEPACKAGES" ]; then
     $CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
 fi
 recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade
+
+$CHROOTEXEC /usr/bin/apt-get -y "${FORCE_CONFNEW[@]}" dist-upgrade 
 $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKAGES
 save_aptcache
 $CHROOTEXEC /usr/bin/apt-get clean || true