[26900] in Source-Commits
Re: /svn/athena r25820 r25821 - in trunk/debathena/scripts: .
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Feb 21 22:47:38 2013
Date: Thu, 21 Feb 2013 22:47:29 -0500 (EST)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201302212059.r1LKxle1013732@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1302212247080.9389@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
r25820 and r25821 in aggregate do the right thing, yes.
-Ben
On Thu, 21 Feb 2013, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2013-02-21 15:59:47 -0500 (Thu, 21 Feb 2013)
> New Revision: 25821
>
> Modified:
> trunk/debathena/scripts/installer/install-debathena.beta.sh
> trunk/debathena/scripts/sbuildhack
> Log:
> Revert parts of r25820
>
> Modified: trunk/debathena/scripts/installer/install-debathena.beta.sh
> ===================================================================
> --- trunk/debathena/scripts/installer/install-debathena.beta.sh 2013-02-21 20:58:51 UTC (rev 25820)
> +++ trunk/debathena/scripts/installer/install-debathena.beta.sh 2013-02-21 20:59:47 UTC (rev 25821)
> @@ -89,13 +89,8 @@
> quantal)
> ubuntu=yes
> aptitude=apt-get
> - output "The release you are running ($distro) is not yet supported"
> + output "The release you are running ($distro) is not supported"
> output "and installing Debathena on it is probably a bad idea."
> - output "(New releases are generally supported a couple of weeks"
> - output "after the official release date. We strongly encourage you"
> - output "to check http://debathena.mit.edu for support information"
> - output "and try again later, or install the previous version of"
> - output "the operating system.)"
> if ! test -f /root/pxe-install-flag; then
> ask "Are you sure you want to proceed? [y/N] " n
> [ y != "$answer" ] && exit 1
>
> Modified: trunk/debathena/scripts/sbuildhack
> ===================================================================
> --- trunk/debathena/scripts/sbuildhack 2013-02-21 20:58:51 UTC (rev 25820)
> +++ trunk/debathena/scripts/sbuildhack 2013-02-21 20:59:47 UTC (rev 25821)
> @@ -28,20 +28,9 @@
> exit
> fi
>
> -SBUILD_EXTRA_ARGS=
> -if [ "$DEBATHENA_PRESERVE_CHROOT" = "yes" ]; then
> - SBUILD_EXTRA_ARGS="--purge=never --purge-session=never --purge-deps=never"
> -fi
> -
> env DEBATHENA_BUILD_DIST="$dist" \
> sbuild --append-to-version=`gettag "$dist"` \
> -d "$dist" --arch="$arch" \
> --apt-update --apt-distupgrade \
> --setup-hook="$(readlink -f "$DA_SCRIPTS_DIR/chroot-sources")" \
> - -v "$SBUILD_EXTRA_ARGS" "$@"
> -rc=$?
> -if [ "$DEBATHENA_PRESERVE_CHROOT" = "yes" ]; then
> - echo "NOTE: build chroot has been preserved. Clean it up manually" >&2
> - echo "with schroot -e." > &2
> -fi
> -exit $rc
> \ No newline at end of file
> + -v "$@"
>
>
