aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--debian/changelog5
-rwxr-xr-xpbuilder-createbuildenv2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 104452d..9a2c574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-12-17 Junichi Uekawa <dancer@debian.org>
+ * pbuilder-createbuildenv: use FORCE_CONFNEW in 'pbuilder create'
+ also, since dist-upgrade here may cause configuration file change
+ if enough change exists. e.g. when OTHERMIRROR is set to
+ backports.org
+
* pbuilder: remove '/run' after 'execute'
2006-12-09 Loic Minier <lool@dooz.org>
diff --git a/debian/changelog b/debian/changelog
index 9875d3f..aca63b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ pbuilder (0.162) UNRELEASED; urgency=low
* Bug fix: "pbuilder does not clean the /run script from pbuilder
execute", thanks to Artur R. Czechowski (Closes: #403414).
+ * Bug fix: "'EOF on stdin at conffile prompt'; when upgrading to etch",
+ thanks to Max Kellermann (Closes: #401863). Surfaced when doing
+ 'pbuilder create' with stable, and OTHERMIRROR set to backports.
- -- Junichi Uekawa <dancer@debian.org> Sun, 17 Dec 2006 10:59:22 +0900
+ -- Junichi Uekawa <dancer@debian.org> Sun, 17 Dec 2006 11:07:07 +0900
pbuilder (0.161) unstable; urgency=low
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 15fe168..935759d 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -87,7 +87,7 @@ if [ -n "$REMOVEPACKAGES" ]; then
$CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
fi
recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev apt $EXTRAPACKAGES
save_aptcache