[24156] in Source-Commits
/svn/athena r23758 - in trunk/debathena/third: common cyrus-sasl2-mit openafs
daemon@ATHENA.MIT.EDU (Evan Broder)
Thu Apr 23 18:52:46 2009
Date: Thu, 23 Apr 2009 18:52:29 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200904232252.n3NMqTEx010044@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 18:52:29 -0400 (Thu, 23 Apr 2009)
New Revision: 23758
Modified:
trunk/debathena/third/common/debathenificator.sh
trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit
trunk/debathena/third/openafs/debathenify-openafs
Log:
Update debathenified packages to check for exact version matches.
Previously, these packages wouldn't check the release-specific tag, so
that if the tag changed (i.e. from ~ubuntu9.04~0.1 to ~ubuntu9.04 when
Jaunty released), debathenified packages wouldn't get rebuilt.
Modified: trunk/debathena/third/common/debathenificator.sh
===================================================================
--- trunk/debathena/third/common/debathenificator.sh 2009-04-23 03:54:39 UTC (rev 23757)
+++ trunk/debathena/third/common/debathenificator.sh 2009-04-23 22:52:29 UTC (rev 23758)
@@ -10,6 +10,8 @@
a=
if [ "$1" = "-A" ]; then a=-A; shift; fi
chroot=$dist_arch-sbuild
+. /mit/debathena/bin/debian-versions.sh
+tag=$(gettag $dist)
if [ -z "$dist_arch" -o $# -eq 0 ]; then
echo 'No arguments!' >&2
@@ -125,9 +127,6 @@
REPREPRO="v reprepro -Vb $DEBATHENA_APT"
REPREPROI="$REPREPRO --ignore=wrongdistribution --ignore=missingfield"
- . /mit/debathena/bin/debian-versions.sh
- tag=$(gettag $dist)
-
if [ "$a" = "-A" ]; then
$REPREPROI include "${dist}${release}" "${daname}_${daversion}_source.changes"
fi
@@ -160,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")~" -- Architecture;
+ dpkg-awk -f - "Package:^$daname\$" "Version:^$(quote "$daversion$tag")" -- Architecture;
zcat $pkgfiles | \
- dpkg-awk -f - "Source:^$daname\$" "Version:^$(quote "$daversion")~" -- 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 03:54:39 UTC (rev 23757)
+++ trunk/debathena/third/cyrus-sasl2-mit/debathenify-cyrus-sasl2-mit 2009-04-23 22:52:29 UTC (rev 23758)
@@ -27,6 +27,8 @@
a=
if [ "$1" = "-A" ]; then a=-A; shift; fi
chroot=$dist_arch-sbuild
+. /mit/debathena/bin/debian-versions.sh
+tag=$(gettag $dist)
if [ -z "$dist_arch" -o $# -eq 0 ]; then
echo 'No arguments!' >&2
@@ -95,9 +97,6 @@
REPREPRO="v reprepro -Vb $DEBATHENA_APT"
REPREPROI="$REPREPRO --ignore=wrongdistribution --ignore=missingfield"
- . /mit/debathena/bin/debian-versions.sh
- tag=$(gettag $dist)
-
if [ "$a" = "-A" ]; then
$REPREPROI include "${dist}${release}" "${name}_${daversion}_source.changes"
fi
@@ -131,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~" -- 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
Modified: trunk/debathena/third/openafs/debathenify-openafs
===================================================================
--- trunk/debathena/third/openafs/debathenify-openafs 2009-04-23 03:54:39 UTC (rev 23757)
+++ trunk/debathena/third/openafs/debathenify-openafs 2009-04-23 22:52:29 UTC (rev 23758)
@@ -203,7 +203,7 @@
repover=$(zcat $pkgfiles \
| dpkg-awk -f - "Package:^$(quote $afs_mpkg)\$" -- Version \
| sed -e 's/^Version: //')
- if [ "x${repover%%~*}" = "x$ver" ]; then
+ if [ "x$repover" = "x$ver$tag" ]; then
echo "*** Already up to date: $dist_arch $afs_mpkg"
continue
fi
