[24158] in Source-Commits
/svn/athena r23760 - in trunk/debathena/third: common cyrus-sasl2-mit
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Apr 23 19:00:31 2009
Date: Thu, 23 Apr 2009 19:00:18 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200904232300.n3NN0IaV010530@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-04-23 19:00:18 -0400 (Thu, 23 Apr 2009)
New Revision: 23760
Modified:
trunk/debathena/third/common/debathenificator.sh
trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit
Log:
When testing to see if a debathenified package has been built already,
anchor the version number at the beginning and the end.
Modified: trunk/debathena/third/common/debathenificator.sh
===================================================================
--- trunk/debathena/third/common/debathenificator.sh 2009-04-23 22:56:51 UTC (rev 23759)
+++ trunk/debathena/third/common/debathenificator.sh 2009-04-23 23:00:18 UTC (rev 23760)
@@ -159,9 +159,9 @@
# Source: header for a package whose name matches its source.
pkgfiles="$DEBATHENA_APT/dists/$dist/$section/binary-$arch/Packages.gz $DEBATHENA_APT/dists/${dist}-proposed/$section/binary-$arch/Packages.gz"
if { zcat $pkgfiles | \
- dpkg-awk -f - "Package:^$daname\$" "Version:^$(quote "$daversion$tag")" -- Architecture;
+ dpkg-awk -f - "Package:^$daname\$" "Version:^$(quote "$daversion$tag")\$" -- Architecture;
zcat $pkgfiles | \
- dpkg-awk -f - "Source:^$daname\$" "Version:^$(quote "$daversion$tag")" -- Architecture; } \
+ dpkg-awk -f - "Source:^$daname\$" "Version:^$(quote "$daversion$tag")\$" -- Architecture; } \
| if [ "$a" = "-A" ]; then cat; else fgrep -vx 'Architecture: all'; fi \
| grep -q .; then
echo "$daname $daversion already exists for $dist_arch." >&2
Modified: trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit
===================================================================
--- trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit 2009-04-23 22:56:51 UTC (rev 23759)
+++ trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit 2009-04-23 23:00:18 UTC (rev 23760)
@@ -130,7 +130,7 @@
daversion=$origversion-0$daversionappend
if zcat "$DEBATHENA_APT/dists/$dist/debathena/binary-$arch/Packages.gz" | \
- dpkg-awk -f - "Source:^$name\$" "Version:^$daversion$tag" -- Architecture | \
+ dpkg-awk -f - "Source:^$name\$" "Version:^$daversion$tag\$" -- Architecture | \
if [ "$a" = "-A" ]; then cat; else fgrep -vx 'Architecture: all'; fi | \
grep -q .; then
echo "$name $daversion already exists for $dist_arch." >&2
