[23494] in Source-Commits
/svn/athena r23140 - trunk/debathena/third/openafs
daemon@ATHENA.MIT.EDU (andersk@MIT.EDU)
Fri Aug 15 03:42:15 2008
Date: Fri, 15 Aug 2008 03:42:00 -0400 (EDT)
From: andersk@MIT.EDU
Message-Id: <200808150742.DAA09133@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2008-08-15 03:41:59 -0400 (Fri, 15 Aug 2008)
New Revision: 23140
Modified:
trunk/debathena/third/openafs/debathenify-openafs
Log:
Use fgrep -x, so as not to forget about -686 if -686-bigmem failed to build.
Modified: trunk/debathena/third/openafs/debathenify-openafs
===================================================================
--- trunk/debathena/third/openafs/debathenify-openafs 2008-08-15 06:58:47 UTC (rev 23139)
+++ trunk/debathena/third/openafs/debathenify-openafs 2008-08-15 07:41:59 UTC (rev 23140)
@@ -104,12 +104,12 @@
for hdr in $headers; do
# Check if we already have one.
module=$(echo "$hdr" | sed -e 's/^linux-headers/openafs-modules/')
- if zcat "$pkgfile" | fgrep -q "$module"; then
+ if zcat "$pkgfile" | fgrep -qx "Package: $module"; then
echo "*** Already exists: $dist_arch $module"
continue
fi
- if fgrep -q "$dist_arch $hdr" failed.log; then
+ if fgrep -qx "$dist_arch $hdr" failed.log; then
echo "*** Prior build failure: $dist_arch $module"
continue
fi
@@ -199,7 +199,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 -q "$module"; then
+ if ! zcat "$pkgfile" | 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"
