[26859] in Source-Commits
Re: /svn/athena r25797 - trunk/debathena/scripts/build-server
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Mon Nov 5 13:32:02 2012
Date: Mon, 5 Nov 2012 13:31:52 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201211051617.qA5GHRsm002599@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1211051331330.2164@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII
Ooh, documentation! ACK
-Ben
On Mon, 5 Nov 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-11-05 11:17:27 -0500 (Mon, 05 Nov 2012)
> New Revision: 25797
>
> Modified:
> trunk/debathena/scripts/build-server/make-chroot
> Log:
> Add usage message and make error messages clearer
>
> Modified: trunk/debathena/scripts/build-server/make-chroot
> ===================================================================
> --- trunk/debathena/scripts/build-server/make-chroot 2012-11-01 15:39:40 UTC (rev 25796)
> +++ trunk/debathena/scripts/build-server/make-chroot 2012-11-05 16:17:27 UTC (rev 25797)
> @@ -12,7 +12,9 @@
> while getopts 'dzot' opt; do
> case "$opt" in
> d)
> - DEBUG=1;;
> + DEBUG=1
> + set -x
> + ;;
> z)
> BZ2=1;;
> o)
> @@ -27,8 +29,13 @@
> echo "-z is meaningless if not using a tar chroot and will be ignored" >&2
> fi
>
> -set -xe
> +if [ -z "$1" ] || [ -z "$2" ]; then
> + echo "Usage: $0 <suite> <arch>" >&2
> + exit 1
> +fi
>
> +set -e
> +
> : ${VG=/dev/builder}
> : ${CHROOTDIR=/srv}
> : ${MIRRORHOST=localhost:9999}
> @@ -46,7 +53,7 @@
> trap 'exittrap' EXIT
>
> if fgrep -qxRs "[$CHROOT]" /etc/schroot/schroot.conf /etc/schroot/chroot.d; then
> - echo "Chroot $CHROOT already exists." >&2
> + echo "Chroot $CHROOT config already exists." >&2
> exit 1
> fi
> if [ "$TYPE" = "tar" ] && [ -e "$FILE" ]; then
> @@ -82,7 +89,7 @@
> SOURCES="$SOURCESD/ubuntu/$SUITE.list"
> MIRROR="http://$MIRRORHOST/ubuntu"
> else
> - echo "Unrecognized suite $SUITE." >&2
> + echo "Unrecognized suite $SUITE. (Did you create the sources.list file?)" >&2
> exit 1
> fi
>
>
>
