[24018] in Source-Commits
/svn/athena r23627 - trunk/debathena/third/openafs
daemon@ATHENA.MIT.EDU (Evan Broder)
Sat Mar 14 19:16:56 2009
Date: Sat, 14 Mar 2009 19:16:44 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903142316.n2ENGieu012032@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-14 19:16:44 -0400 (Sat, 14 Mar 2009)
New Revision: 23627
Modified:
trunk/debathena/third/openafs/debathenify-openafs
Log:
When debathenifying openafs, don't ignore packages that have been
uploaded to -proposed.
Modified: trunk/debathena/third/openafs/debathenify-openafs
===================================================================
--- trunk/debathena/third/openafs/debathenify-openafs 2009-03-14 22:05:45 UTC (rev 23626)
+++ trunk/debathena/third/openafs/debathenify-openafs 2009-03-14 23:16:44 UTC (rev 23627)
@@ -18,7 +18,7 @@
. /mit/debathena/bin/debian-versions.sh
tag=$(gettag $dist)
: ${DEBATHENA_APT=/mit/debathena/apt}
-pkgfile=$DEBATHENA_APT/dists/$dist/openafs/binary-$arch/Packages.gz
+pkgfiles="$DEBATHENA_APT/dists/$dist/openafs/binary-$arch/Packages.gz $DEBATHENA_APT/dists/${dist}-proposed/openafs/binary-$arch/Packages.gz"
do_binary=no
do_upload=no
@@ -114,7 +114,7 @@
# Check if we already have one.
module=$(echo "$hdr" | sed -e 's/^linux-headers/openafs-modules/')
- if zcat "$pkgfile" | \
+ if zcat $pkgfiles | \
dpkg-awk -f - "Package:^$module\$" "Version:^$(quote "$afsv+$hdrv")\$" | \
grep -q .; then
echo "*** Already exists: $dist_arch $module"
@@ -198,7 +198,7 @@
afs_mpkg=$(echo "$image_mpkg" | sed -e 's/^linux-image/openafs-modules/')
# Check if we already have an up-to-date OpenAFS metapackage.
- repover=$(zcat "$pkgfile" \
+ repover=$(zcat $pkgfiles \
| dpkg-awk -f - "Package:^$(quote $afs_mpkg)\$" -- Version \
| sed -e 's/^Version: //')
if [ "x${repover%%~*}" = "x$ver" ]; then
@@ -210,7 +210,7 @@
# repository or in the build directory.
dep=$(echo "$info" | sed -ne 's/^Depends:.*\(linux-image-[^ ,]*\).*$/\1/p')
module=$(echo "$dep" | sed -e 's/^linux-image/openafs-modules/')
- if ! zcat "$pkgfile" | fgrep -qx "Package: $module"; then
+ if ! zcat $pkgfiles | fgrep -qx "Package: $module"; then
ch=$(ls "$dist_arch/$module"_*.changes 2>/dev/null)
if [ -z "$ch" ]; then
echo "*** No module: $dist_arch $afs_mpkg"
