From: Hugo Villeneuve Date: Thu, 15 May 2014 23:52:44 +0000 (-0400) Subject: Fix bug when retrieving some patches X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;ds=sidebyside;h=c6c53a064eed101cd0dfb7ed63de122bdea5fc77;p=hvlinux.git Fix bug when retrieving some patches Some patches are compressed (iana), and the script was catching them even if they didn't finish in .patch (.patch.xz). --- diff --git a/functions/fpkg b/functions/fpkg index 39717d1..dbbc838 100644 --- a/functions/fpkg +++ b/functions/fpkg @@ -235,13 +235,14 @@ static_checkpatch() # Patches list formats (patches-list-*.html): # LFS: a href="name.patch" - # hugovil: A HREF "dir/subdir/subdir/name.patch + # hugovil: a href="dir/subdir/subdir/name.patch" # We must search for a patch beginning with either a slash or a " to avoid # the possibility of having another package name within a patch name: # if patch = Mesalib-8.0.4-llvm-3.1-fixes-1.patch # then we could erroneously try to download patch "llvm-3.1-fixes-1.patch" local PATCHES_FOUND=$(cat ${PATCHES_LIST} | \ egrep "\"${PACK_URL}-|/${PACK_URL}-" | \ + egrep ".patch\"" | \ sed "s/.*\(${PACK_URL}-.*\.patch\)\".*/\1/") if [ -n "${PATCHES_FOUND}" ]; then