aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rwxr-xr-xpbuilder-createbuildenv2
-rw-r--r--pbuilder-modules4
3 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index e5f068e..cfc41c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,15 @@ pbuilder (0.11) unstable; urgency=low
it will be possible to catch such possible error.
* patch from fbiere@abacom.com, fixes build-dependency with
OR conditions. It used to try out all. (closes: #119541)
-
- -- Junichi Uekawa <dancer@debian.org> Sun, 18 Nov 2001 11:33:43 +0900
+ * Redundant "case" removed from pbuilder-createbasetgz.
+ (it was introduced in 0.10).
+ Thanks go to Steve for pointing this out.
+ (closes: #12057)
+ * Fixed the reverse-logic for the "distribution is not specified"
+ line in pbuilder-modules. Thanks for steven.robbins@videotron.ca
+ (again) for pointing this out. (closes: #120063)
+
+ -- Junichi Uekawa <dancer@debian.org> Sun, 18 Nov 2001 17:56:06 +0900
pbuilder (0.10) unstable; urgency=low
diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index ac35611..7ad8cff 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -40,7 +40,7 @@ fi
mkdir -p "$BUILDPLACE/tmp/buildd"
echo " -> copying local configuration"
-case
+
for a in hosts hostname resolv.conf ; do
cp -r /etc/$a "$BUILDPLACE/etc/";
done
diff --git a/pbuilder-modules b/pbuilder-modules
index bb15e6d..2ca91ef 100644
--- a/pbuilder-modules
+++ b/pbuilder-modules
@@ -80,10 +80,10 @@ function abortingfunction () {
function installaptlines (){
echo Installing apt-lines
rm -f "$BUILDPLACE"/etc/apt/sources.list
- test -n "$DISTRIBUTION" && (
+ if [ -z "$DISTRIBUTION" ]; then
echo "Distribution not specified, please specify" >&2
exit 1
- )
+ fi
if [ -n "$BUILDPLACE" ] ; then
cat >> "$BUILDPLACE"/etc/apt/sources.list << EOF
deb $MIRRORSITE $DISTRIBUTION main contrib non-free