[23982] in Source-Commits
/svn/athena r23592 - trunk/debathena/third/common
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Mar 9 13:19:32 2009
Date: Mon, 9 Mar 2009 13:19:23 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200903091719.n29HJNZ8016916@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-03-09 13:19:23 -0400 (Mon, 09 Mar 2009)
New Revision: 23592
Modified:
trunk/debathena/third/common/debathenificator.sh
Log:
In the debathenificator, check both production and proposed before
re-building a package.
Modified: trunk/debathena/third/common/debathenificator.sh
===================================================================
--- trunk/debathena/third/common/debathenificator.sh 2009-03-09 16:25:41 UTC (rev 23591)
+++ trunk/debathena/third/common/debathenificator.sh 2009-03-09 17:19:23 UTC (rev 23592)
@@ -140,10 +140,10 @@
# if we weren't run with the -A flag). We need to look for either a
# Source: or a Package: header matching $name since there is no
# Source: header for a package whose name matches its source.
-pkgfile=$DEBATHENA_APT/dists/$dist/$section/binary-$arch/Packages.gz
-if { zcat "$pkgfile" | \
+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:^$name\$" "Version:^$daversion~" -- Architecture;
- zcat "$pkgfile" | \
+ zcat $pkgfiles | \
dpkg-awk -f - "Source:^$name\$" "Version:^$daversion~" -- Architecture; } \
| if [ "$a" = "-A" ]; then cat; else fgrep -vx 'Architecture: all'; fi \
| grep -q .; then
