[25686] in Source-Commits
/svn/athena r25169 - trunk/debathena/third/openafs
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Sun Jun 26 17:56:57 2011
Date: Sun, 26 Jun 2011 17:56:50 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <201106262156.p5QLuoLR031361@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
