package pbuilder
tags 316281 + patch
thanks
Attached is a patch to work around the changes to apt. If this hasn't
been fixed in 10 days I may upload it as an NMU.
--
Blars Blarson [EMAIL PROTECTED]
http://www.blars.org/blars.html
With Microsoft, failure is not an option. It is a standard feature.
diff -u -r ../src3/pbuilder-0.127/ChangeLog pbuilder-0.127/ChangeLog
--- ../src3/pbuilder-0.127/ChangeLog 2005-04-21 15:37:05.000000000 -0700
+++ pbuilder-0.127/ChangeLog 2005-06-30 17:44:54.000000000 -0700
@@ -1,3 +1,8 @@
+2005-06-30 Blars Blarson <[EMAIL PROTECTED]>
+
+ * add --force-yes to all uses of apt-get -y to allow it to work
+ with new version of apt.
+
2005-04-22 Junichi Uekawa <[EMAIL PROTECTED]>
* pbuilder-buildpackage: call save_aptcache after running final B hook
diff -u -r ../src3/pbuilder-0.127/debian/changelog
pbuilder-0.127/debian/changelog
--- ../src3/pbuilder-0.127/debian/changelog 2005-04-21 15:38:16.000000000
-0700
+++ pbuilder-0.127/debian/changelog 2005-06-30 17:47:33.000000000 -0700
@@ -1,3 +1,11 @@
+pbuilder (0.127-0.1) unstable; urgency=low
+
+ * NMU to fix RC bug
+ * add --force-yes to all apt-get -y calls to make it work with
+ new version of apt.
+
+ -- Blars Blarson <[EMAIL PROTECTED]> Thu, 30 Jun 2005 17:44:59 -0700
+
pbuilder (0.127) unstable; urgency=low
* pdebuild.1, pdebuild-user-mode-linux.1: --debsign-k requires key-id.
diff -u -r ../src3/pbuilder-0.127/pbuilder-createbuildenv
pbuilder-0.127/pbuilder-createbuildenv
--- ../src3/pbuilder-0.127/pbuilder-createbuildenv 2004-12-01
15:41:32.000000000 -0800
+++ pbuilder-0.127/pbuilder-createbuildenv 2005-06-30 17:38:06.000000000
-0700
@@ -76,8 +76,8 @@
$CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
fi
recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -y dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt
$EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev
apt $EXTRAPACKAGES
save_aptcache
$CHROOTEXEC /usr/bin/apt-get clean
diff -u -r ../src3/pbuilder-0.127/pbuilder-satisfydepends
pbuilder-0.127/pbuilder-satisfydepends
--- ../src3/pbuilder-0.127/pbuilder-satisfydepends 2003-04-19
20:40:36.000000000 -0700
+++ pbuilder-0.127/pbuilder-satisfydepends 2005-06-30 17:38:59.000000000
-0700
@@ -147,10 +147,10 @@
# now actually install the packages
echo " -> Installing ${INSTALLPKGLIST}"
- if ! $CHROOTEXEC apt-get -y install ${INSTALLPKGLIST}; then
+ if ! $CHROOTEXEC apt-get -y --force-yes install ${INSTALLPKGLIST}; then
echo " -> Trying to fix apt error"
# Work around an apt bug which causes configure to fail.
- if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y
install ${INSTALLPKGLIST}; then
+ if $CHROOTEXEC dpkg --configure --pending && $CHROOTEXEC apt-get -y
--force-yes install ${INSTALLPKGLIST}; then
echo " -> Apt bug workaround succeeded"
elif [ "$CONTINUE_FAIL" != "yes" ]; then
echo "E: Unrecoverable error installing build-dependencies." >&2
@@ -191,7 +191,7 @@
# if package exists, remove it.
if $CHROOTEXEC /usr/bin/dpkg -s $(echo "$INSTALLPKG" | tr "/" " " | awk
'{print $1}') 2>&1 | grep ^Package: > /dev/null; then
- if ! $CHROOTEXEC /usr/bin/apt-get -y remove ${CURRENTREALPKGNAME} ;
then
+ if ! $CHROOTEXEC /usr/bin/apt-get -y --force-yes remove
${CURRENTREALPKGNAME} ; then
echo "E: Could not satisfy build-conflicts" >&2
exit 1
fi
diff -u -r ../src3/pbuilder-0.127/pbuilder-updatebuildenv
pbuilder-0.127/pbuilder-updatebuildenv
--- ../src3/pbuilder-0.127/pbuilder-updatebuildenv 2004-06-16
17:19:59.000000000 -0700
+++ pbuilder-0.127/pbuilder-updatebuildenv 2005-06-30 17:40:35.000000000
-0700
@@ -44,8 +44,8 @@
recover_aptcache
$TRAP saveaptcache_umountproc_cleanbuildplace exit
-$CHROOTEXEC /usr/bin/apt-get -y "[EMAIL PROTECTED]" dist-upgrade
-$CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt
$EXTRAPACKAGES
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes "[EMAIL PROTECTED]" dist-upgrade
+$CHROOTEXEC /usr/bin/apt-get -y --force-yes install build-essential dpkg-dev
apt $EXTRAPACKAGES
save_aptcache
$TRAP umountproc_cleanbuildplace exit
$CHROOTEXEC /usr/bin/apt-get clean || true
diff -u -r ../src3/pbuilder-0.127/pdebuild-internal
pbuilder-0.127/pdebuild-internal
--- ../src3/pbuilder-0.127/pdebuild-internal 2005-01-03 17:47:18.000000000
-0800
+++ pbuilder-0.127/pdebuild-internal 2005-06-30 17:42:33.000000000 -0700
@@ -29,7 +29,7 @@
echo "Using: $Id: pdebuild-internal,v 1.4 2005/01/04 01:47:18 dancer Exp $"
# I am probably running as root; make sure I have pbuilder installed here.
-apt-get install -y pbuilder
+apt-get install -y --force-yes pbuilder
# I'm not going to have the same LOGNAME as outside, I'm root.
export LOGNAME=root
