[25687] in Source-Commits
Re: /svn/athena r25169 - trunk/debathena/third/openafs
daemon@ATHENA.MIT.EDU (Jonathan Reed)
Sun Jun 26 18:01:55 2011
Mime-Version: 1.0 (Apple Message framework v1084)
Content-Type: text/plain; charset=us-ascii
From: Jonathan Reed <jdreed@MIT.EDU>
In-Reply-To: <201106262156.p5QLuoLR031361@drugstore.mit.edu>
Date: Sun, 26 Jun 2011 18:01:45 -0400
Cc: source-commits@mit.edu
Message-Id: <7E2D1F6D-E2C7-409D-96E2-A11A076DFF33@mit.edu>
To: Geoffrey Thomas <geofft@mit.edu>
Content-Transfer-Encoding: 8bit
ACK to push this to the production checkout (though still pointed at proposed).
On Jun 26, 2011, at 5:56 PM, Geoffrey Thomas wrote:
> Author: geofft
> Date: 2011-06-26 17:56:50 -0400 (Sun, 26 Jun 2011)
> New Revision: 25169
>
> Modified:
> trunk/debathena/third/openafs/debathenify-openafs
> Log:
> Correctly handle multiple simultaneous versions of metapackages
>
> When uploading a new version to -proposed, an old version will continue
> to be in production; this means that dpkg-awk can return multiple
> stanzas. So, grep the output, instead of expecting the output to be a
> single line.
>
> This updates r23627.
>
>
>
> Modified: trunk/debathena/third/openafs/debathenify-openafs
> ===================================================================
> --- trunk/debathena/third/openafs/debathenify-openafs 2011-06-25 18:06:50 UTC (rev 25168)
> +++ trunk/debathena/third/openafs/debathenify-openafs 2011-06-26 21:56:50 UTC (rev 25169)
> @@ -213,10 +213,10 @@
> fi
>
> # Check if we already have an up-to-date OpenAFS metapackage.
> - repover=$(zcat $pkgfiles \
> + if zcat $pkgfiles \
> | dpkg-awk -f - "Package:^$(quote $afs_mpkg)\$" -- Version \
> - | sed -e 's/^Version: //')
> - if [ "x$repover" = "x$ver$tag" ]; then
> + | sed -ne 's/^Version: //p' \
> + | fgrep -qx "$ver$tag"; then
> echo "*** Already up to date: $dist_arch $afs_mpkg"
> continue
> fi
>
