Author: arekm Date: Thu Jul 14 07:32:04 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- escape some regexp characters in file name, so grep has a chance to find line
with that file name
---- Files affected:
packages:
builder (1.648 -> 1.649)
---- Diffs:
================================================================
Index: packages/builder
diff -u packages/builder:1.648 packages/builder:1.649
--- packages/builder:1.648 Sat Jun 25 15:20:19 2011
+++ packages/builder Thu Jul 14 09:31:59 2011
@@ -831,9 +831,12 @@
# Warning: unpredictable results if same URL used twice
src_no() {
+ local file="$1"
+ # escape some regexp characters if part of file name
+ file=$(echo "$file" | sed -e 's#\([\+\*\.]\)#\\\1#g')
cd $PACKAGE_DIR
rpm_dump | \
- grep -E "(SOURCE|PATCH)URL[0-9]*[ ]*$1""[ ]*$" | \
+ grep -E "(SOURCE|PATCH)URL[0-9]*[ ]*${file}""[ ]*$" | \
sed -e 's/.*\(SOURCE\|PATCH\)URL\([0-9][0-9]*\).*/\1\2/' | \
head -n 1 | tr OURCEATH ourceath | xargs
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.648&r2=1.649&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
