[26268] in Source-Commits
Re: /svn/athena r25479 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon May 7 15:55:46 2012
Date: Mon, 7 May 2012 12:55:44 -0700 (PDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201205071953.q47Jrefw008648@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1205071255430.21568@dr-wily.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK, thanks.
--
Geoffrey Thomas
geofft@mit.edu
On Mon, 7 May 2012, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2012-05-07 15:53:40 -0400 (Mon, 07 May 2012)
> New Revision: 25479
>
> Modified:
> trunk/debathena/scripts/daupload-proposed
> trunk/debathena/scripts/sbuildhack
> Log:
> Fix quoting issues
> sbuildhack errors out if no .dsc file specified
>
> Modified: trunk/debathena/scripts/daupload-proposed
> ===================================================================
> --- trunk/debathena/scripts/daupload-proposed 2012-05-07 19:47:10 UTC (rev 25478)
> +++ trunk/debathena/scripts/daupload-proposed 2012-05-07 19:53:40 UTC (rev 25479)
> @@ -78,7 +78,7 @@
> elif [ -n "$NOBUILD" ]; then
> newcodes=
> for code in $DEBIAN_CODES; do
> - if ! echo $NOBUILD | fgrep -q "$code"; then
> + if ! echo "$NOBUILD" | fgrep -q "$code"; then
> newcodes="$newcodes $code"
> fi
> done
>
> Modified: trunk/debathena/scripts/sbuildhack
> ===================================================================
> --- trunk/debathena/scripts/sbuildhack 2012-05-07 19:47:10 UTC (rev 25478)
> +++ trunk/debathena/scripts/sbuildhack 2012-05-07 19:53:40 UTC (rev 25479)
> @@ -23,12 +23,14 @@
> if [ -z "$dist" ] || [ -z "$arch" ]; then usage; fi
>
> dscfile=
> -for i in $@; do
> - if echo $i | grep -q '\.dsc$'; then
> +for i in "$@"; do
> + if echo "$i" | grep -q '\.dsc$'; then
> dscfile=$i
> fi
> done
>
> +[ -n "$dscfile" ] || usage
> +
> NOBUILD=$(grep-dctrl -n -s Debathena-No-Build -F Debathena-No-Build -e . "$dscfile")
> BUILDFOR=$(grep-dctrl -n -s Debathena-Build-For -F Debathena-Build-For -e . "$dscfile")
>
>
>
