[26281] in Source-Commits
Re: /svn/athena r25484 - in trunk/debathena/scripts/build-server: . sources.list.d/debian sources.list.d/ubuntu
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Tue May 8 11:12:20 2012
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <201205072345.q47NjuC2016603@drugstore.mit.edu>
Date: Tue, 8 May 2012 11:12:16 -0400
Cc: source-commits@MIT.EDU
Message-Id: <E7BE80D1-E230-4197-BC7D-06E2865DE2A7@mit.edu>
To: Geoffrey Thomas <geofft@MIT.EDU>
Content-Transfer-Encoding: 8bit
ACK r25482 through 25484.
On May 7, 2012, at 7:45 PM, Geoffrey Thomas wrote:
> Author: geofft
> Date: 2012-05-07 19:45:56 -0400 (Mon, 07 May 2012)
> New Revision: 25484
>
> Modified:
> trunk/debathena/scripts/build-server/make-chroot
> trunk/debathena/scripts/build-server/sources.list.d/debian/lenny.list
> trunk/debathena/scripts/build-server/sources.list.d/debian/squeeze.list
> trunk/debathena/scripts/build-server/sources.list.d/debian/wheezy.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/hardy.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/intrepid.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/jaunty.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/karmic.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/lucid.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/maverick.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/natty.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/oneiric.list
> trunk/debathena/scripts/build-server/sources.list.d/ubuntu/precise.list
> Log:
> make-chroot: Naming two variables MIRROR is a bad plan
>
> Modified: trunk/debathena/scripts/build-server/make-chroot
> ===================================================================
> --- trunk/debathena/scripts/build-server/make-chroot 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/make-chroot 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -9,7 +9,7 @@
> set -xe
>
> : ${CHROOTDIR=/srv}
> -: ${MIRROR=localhost:9999}
> +: ${MIRRORHOST=localhost:9999}
> SUITE=$1
> ARCH=$2
> CHROOT="${SUITE}-${ARCH}-sbuild"
> @@ -49,10 +49,10 @@
> SOURCESD="$DATA/sources.list.d"
> if [ -e "$SOURCESD/debian/$SUITE.list" ]; then
> SOURCES="$SOURCESD/debian/$SUITE.list"
> - MIRROR="http://$MIRROR/debian"
> + MIRROR="http://$MIRRORHOST/debian"
> elif [ -e "$SOURCESD/ubuntu/$SUITE.list" ]; then
> SOURCES="$SOURCESD/ubuntu/$SUITE.list"
> - MIRROR="http://$MIRROR/ubuntu"
> + MIRROR="http://$MIRRORHOST/ubuntu"
> else
> echo "Unrecognized suite $SUITE." >&2
> exit 1
> @@ -94,7 +94,7 @@
> debconf-set-selections <<SELECTIONS
> debconf debconf/frontend select Noninteractive
> SELECTIONS
> -sed "s|MIRROR|$MIRROR|" <&8 > /etc/apt/sources.list
> +sed "s|MIRRORHOST|$MIRRORHOST|" <&8 > /etc/apt/sources.list
> ! type apt-key >/dev/null || apt-key add - <&9
> apt-get -q -y update
> apt-get -q -y dist-upgrade
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/debian/lenny.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/debian/lenny.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/debian/lenny.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,4 +1,4 @@
> -deb http://MIRROR/debian lenny main
> -deb-src http://MIRROR/debian lenny main
> -deb http://MIRROR/debian-security lenny/updates main
> -deb-src http://MIRROR/debian-security lenny/updates main
> +deb http://MIRRORHOST/debian lenny main
> +deb-src http://MIRRORHOST/debian lenny main
> +deb http://MIRRORHOST/debian-security lenny/updates main
> +deb-src http://MIRRORHOST/debian-security lenny/updates main
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/debian/squeeze.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/debian/squeeze.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/debian/squeeze.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,4 +1,4 @@
> -deb http://MIRROR/debian squeeze main
> -deb-src http://MIRROR/debian squeeze main
> -deb http://MIRROR/debian-security squeeze/updates main
> -deb-src http://MIRROR/debian-security squeeze/updates main
> +deb http://MIRRORHOST/debian squeeze main
> +deb-src http://MIRRORHOST/debian squeeze main
> +deb http://MIRRORHOST/debian-security squeeze/updates main
> +deb-src http://MIRRORHOST/debian-security squeeze/updates main
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/debian/wheezy.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/debian/wheezy.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/debian/wheezy.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,4 +1,4 @@
> -deb http://MIRROR/debian wheezy main
> -deb-src http://MIRROR/debian wheezy main
> -deb http://MIRROR/debian-security wheezy/updates main
> -deb-src http://MIRROR/debian-security wheezy/updates main
> +deb http://MIRRORHOST/debian wheezy main
> +deb-src http://MIRRORHOST/debian wheezy main
> +deb http://MIRRORHOST/debian-security wheezy/updates main
> +deb-src http://MIRRORHOST/debian-security wheezy/updates main
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/hardy.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/hardy.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/hardy.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu hardy main restricted universe
> -deb-src http://MIRROR/ubuntu hardy main restricted universe
> -deb http://MIRROR/ubuntu hardy-updates main restricted universe
> -deb-src http://MIRROR/ubuntu hardy-updates main restricted universe
> -deb http://MIRROR/ubuntu-security hardy-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security hardy-security main restricted universe
> +deb http://MIRRORHOST/ubuntu hardy main restricted universe
> +deb-src http://MIRRORHOST/ubuntu hardy main restricted universe
> +deb http://MIRRORHOST/ubuntu hardy-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu hardy-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security hardy-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security hardy-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/intrepid.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/intrepid.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/intrepid.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu intrepid main restricted universe
> -deb-src http://MIRROR/ubuntu intrepid main restricted universe
> -deb http://MIRROR/ubuntu intrepid-updates main restricted universe
> -deb-src http://MIRROR/ubuntu intrepid-updates main restricted universe
> -deb http://MIRROR/ubuntu-security intrepid-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security intrepid-security main restricted universe
> +deb http://MIRRORHOST/ubuntu intrepid main restricted universe
> +deb-src http://MIRRORHOST/ubuntu intrepid main restricted universe
> +deb http://MIRRORHOST/ubuntu intrepid-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu intrepid-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security intrepid-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security intrepid-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/jaunty.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/jaunty.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/jaunty.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu jaunty main restricted universe
> -deb-src http://MIRROR/ubuntu jaunty main restricted universe
> -deb http://MIRROR/ubuntu jaunty-updates main restricted universe
> -deb-src http://MIRROR/ubuntu jaunty-updates main restricted universe
> -deb http://MIRROR/ubuntu-security jaunty-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security jaunty-security main restricted universe
> +deb http://MIRRORHOST/ubuntu jaunty main restricted universe
> +deb-src http://MIRRORHOST/ubuntu jaunty main restricted universe
> +deb http://MIRRORHOST/ubuntu jaunty-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu jaunty-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security jaunty-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security jaunty-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/karmic.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/karmic.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/karmic.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu karmic main restricted universe
> -deb-src http://MIRROR/ubuntu karmic main restricted universe
> -deb http://MIRROR/ubuntu karmic-updates main restricted universe
> -deb-src http://MIRROR/ubuntu karmic-updates main restricted universe
> -deb http://MIRROR/ubuntu-security karmic-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security karmic-security main restricted universe
> +deb http://MIRRORHOST/ubuntu karmic main restricted universe
> +deb-src http://MIRRORHOST/ubuntu karmic main restricted universe
> +deb http://MIRRORHOST/ubuntu karmic-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu karmic-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security karmic-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security karmic-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/lucid.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/lucid.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/lucid.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu lucid main restricted universe
> -deb-src http://MIRROR/ubuntu lucid main restricted universe
> -deb http://MIRROR/ubuntu lucid-updates main restricted universe
> -deb-src http://MIRROR/ubuntu lucid-updates main restricted universe
> -deb http://MIRROR/ubuntu-security lucid-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security lucid-security main restricted universe
> +deb http://MIRRORHOST/ubuntu lucid main restricted universe
> +deb-src http://MIRRORHOST/ubuntu lucid main restricted universe
> +deb http://MIRRORHOST/ubuntu lucid-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu lucid-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security lucid-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security lucid-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/maverick.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/maverick.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/maverick.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu maverick main restricted universe
> -deb-src http://MIRROR/ubuntu maverick main restricted universe
> -deb http://MIRROR/ubuntu maverick-updates main restricted universe
> -deb-src http://MIRROR/ubuntu maverick-updates main restricted universe
> -deb http://MIRROR/ubuntu-security maverick-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security maverick-security main restricted universe
> +deb http://MIRRORHOST/ubuntu maverick main restricted universe
> +deb-src http://MIRRORHOST/ubuntu maverick main restricted universe
> +deb http://MIRRORHOST/ubuntu maverick-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu maverick-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security maverick-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security maverick-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/natty.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/natty.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/natty.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu natty main restricted universe
> -deb-src http://MIRROR/ubuntu natty main restricted universe
> -deb http://MIRROR/ubuntu natty-updates main restricted universe
> -deb-src http://MIRROR/ubuntu natty-updates main restricted universe
> -deb http://MIRROR/ubuntu-security natty-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security natty-security main restricted universe
> +deb http://MIRRORHOST/ubuntu natty main restricted universe
> +deb-src http://MIRRORHOST/ubuntu natty main restricted universe
> +deb http://MIRRORHOST/ubuntu natty-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu natty-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security natty-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security natty-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/oneiric.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/oneiric.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/oneiric.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu oneiric main restricted universe
> -deb-src http://MIRROR/ubuntu oneiric main restricted universe
> -deb http://MIRROR/ubuntu oneiric-updates main restricted universe
> -deb-src http://MIRROR/ubuntu oneiric-updates main restricted universe
> -deb http://MIRROR/ubuntu-security oneiric-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security oneiric-security main restricted universe
> +deb http://MIRRORHOST/ubuntu oneiric main restricted universe
> +deb-src http://MIRRORHOST/ubuntu oneiric main restricted universe
> +deb http://MIRRORHOST/ubuntu oneiric-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu oneiric-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security oneiric-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security oneiric-security main restricted universe
>
> Modified: trunk/debathena/scripts/build-server/sources.list.d/ubuntu/precise.list
> ===================================================================
> --- trunk/debathena/scripts/build-server/sources.list.d/ubuntu/precise.list 2012-05-07 23:02:25 UTC (rev 25483)
> +++ trunk/debathena/scripts/build-server/sources.list.d/ubuntu/precise.list 2012-05-07 23:45:56 UTC (rev 25484)
> @@ -1,6 +1,6 @@
> -deb http://MIRROR/ubuntu precise main restricted universe
> -deb-src http://MIRROR/ubuntu precise main restricted universe
> -deb http://MIRROR/ubuntu precise-updates main restricted universe
> -deb-src http://MIRROR/ubuntu precise-updates main restricted universe
> -deb http://MIRROR/ubuntu-security precise-security main restricted universe
> -deb-src http://MIRROR/ubuntu-security precise-security main restricted universe
> +deb http://MIRRORHOST/ubuntu precise main restricted universe
> +deb-src http://MIRRORHOST/ubuntu precise main restricted universe
> +deb http://MIRRORHOST/ubuntu precise-updates main restricted universe
> +deb-src http://MIRRORHOST/ubuntu precise-updates main restricted universe
> +deb http://MIRRORHOST/ubuntu-security precise-security main restricted universe
> +deb-src http://MIRRORHOST/ubuntu-security precise-security main restricted universe
>
