aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--debian/TODO5
-rw-r--r--debian/changelog4
-rwxr-xr-xpbuilder-buildpackage4
-rwxr-xr-xpbuilder-updatebuildenv4
5 files changed, 22 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 59d60fb..88fcce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
2002-02-14 Junichi Uekawa <dancer@debian.org>
+ * debian/TODO: document some known bugs and features.
+
+ * pbuilder-updatebuildenv: instead of purge lilo,
+ purge $REMOVEPACKAGES
+ Tried to add something like: -o 'DPkg::Options={"--force-confnew";}'
+ to apt-get dist-upgrade, but it doesn't seem to function.
+
* pbuilder-buildpackage: quoting some string
+ redirct the cp error output to /dev/null because it looks ugly.
+ Slight mods to message
2002-02-13 Junichi Uekawa <dancer@debian.org>
diff --git a/debian/TODO b/debian/TODO
index 4346c90..b931a7e 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -34,5 +34,10 @@ TODO and possible bugs:
* Do not install Build-*-Indep: targets for binary-arch building.
+ * Run the build target with a non-root user.
+ Create a random entry inside the chroot ?
+ * $HOME etc. environment vars are set to bogus values
+ * Lock-filing of $BASETGZ between processes.
+
$Id$
diff --git a/debian/changelog b/debian/changelog
index 2d64c16..88cbbaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ pbuilder (0.23) unstable; urgency=low
* Cache is updated even when Build-Dep processing routine fails.
reported by Mark Brown (closes: #129053)
(please test)
+ * Fix update target to remove packages specified in REMOVEPACKAGES.
+ * pbuilder update requests apt-get to call dpkg with --force-confnew option
- -- Junichi Uekawa <dancer@debian.org> Wed, 13 Feb 2002 02:35:41 +0900
+ -- Junichi Uekawa <dancer@debian.org> Thu, 14 Feb 2002 20:32:58 +0900
pbuilder (0.22) unstable; urgency=low
diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 71088d7..5dd0e94 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -242,9 +242,9 @@ umountproc
if [ -n "$BUILDRESULT" ]; then
mkdir -p "$BUILDRESULT"
if [ -d "$BUILDRESULT" ]; then
- cp "$BUILDPLACE"/tmp/buildd/* "$BUILDRESULT" || true
+ cp "$BUILDPLACE"/tmp/buildd/* "$BUILDRESULT" 2>/dev/null || true
else
- echo "Error: BUILDRESULT=[$BUILDRESULT] and is not a directory." >&2
+ echo "E: BUILDRESULT=[$BUILDRESULT] is not a directory." >&2
fi
fi
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 5a191ae..c081b5e 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -35,7 +35,9 @@ fi
echo "Refreshing the base.tgz "
echo " -> upgrading packages"
$CHROOTEXEC /usr/bin/apt-get update
-$CHROOTEXEC /usr/bin/dpkg --purge lilo
+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 install build-essential dpkg-dev apt $EXTRAPACKAGES