making ready for uploading to Debian archive, changing depends line to debootstrap with versioned depends. Re-tabbing, extactbuildplace function is created to move common code out from create and build. added an error message for unknown parameter option. added a TAGS target to the makefile to make ETAGS work.

1 files changed, 12 insertions, 7 deletions

diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 060b389..104ee4d 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -1,29 +1,34 @@
 #! /bin/bash
-#necessary for installs.
+# Creating the build environment with debootstrap.
 
 . /usr/lib/pbuilder/pbuilder-checkparams
 . /usr/lib/pbuilder/pbuilder-modules
 
 CHROOTEXEC="chroot $BUILDPLACE "
 if [ -z "$DISTRIBUTION" ]; then
-  DISTRIBUTION=woody
+    DISTRIBUTION=woody
 fi
 echo "Distribution is $DISTRIBUTION."
 
 cleanbuildplace
 
-echo "building the build env"
+echo "Building the build environment"
 mkdir -p "$BUILDPLACE"
+if [ ! -d "$BUILDPLACE" ]; then
+    echo "pbuilder: Could not make directory [$BUILDPLACE]" >&2
+    exit 1
+fi
 mountproc
 echo " -> running debootstrap"
-( cd "$BUILDPLACE"; debootstrap "$DISTRIBUTION" . )
+( cd "$BUILDPLACE" && debootstrap "$DISTRIBUTION" . )
+echo " -> debootstrap finished"
 mkdir -p "$BUILDPLACE/tmp/buildd"
 echo " -> copying local configuration"
 for a in passwd hosts hostname resolv.conf apt; do 
-  cp -r /etc/$a "$BUILDPLACE/etc/";
+    cp -r /etc/$a "$BUILDPLACE/etc/";
 done
 
-echo "Installing apt-lines"
+echo " -> installing apt-lines"
 cat > "$BUILDPLACE/etc/apt/sources.list" << EOF
 deb $MIRRORSITE $DISTRIBUTION main contrib non-free
 deb-src $MIRRORSITE $DISTRIBUTION main contrib non-free
@@ -38,6 +43,6 @@ $CHROOTEXEC /usr/bin/apt-get -y install build-essential dpkg-dev apt $EXTRAPACKA
 $CHROOTEXEC /usr/bin/apt-get clean
 umountproc
 echo " -> creating base.tgz"
-( cd "$BUILDPLACE" ; tar cfz "$BASETGZ" * )
+( cd "$BUILDPLACE" && tar cfz "$BASETGZ" * || echo " -> failed building base.tgz")
 cleanbuildplace