summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-01 18:42:55 +0200
committerDan McGee <dan@archlinux.org>2011-09-01 18:42:55 +0200
commit11873b70ae346d06da8590f6bd4bfc19577a8840 (patch)
tree91ec2d5aff54a7c6975f15fb33bc88b894fd8716
parent11ab9aa9f5f0f3873df89c73e8715b82f485bd9b (diff)
downloadpacman-11873b70ae346d06da8590f6bd4bfc19577a8840.tar.gz
pacman-11873b70ae346d06da8590f6bd4bfc19577a8840.tar.xz
makepkg: fix overzealous PGP signature file matching
The regex wasn't rooted at the end of the filename, nor was it matching a period/dot before the file extension. The end result was this matched a file named '07_all_sig.patch' which is totally broken. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e74e5c81..2f06b9b3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -341,7 +341,7 @@ in_array() {
source_has_signatures(){
local file
for file in "${source[@]}"; do
- if [[ $file =~ .*(sig|asc) ]]; then
+ if [[ $file =~ \.(sig|asc)$ ]]; then
return 0
fi
done
@@ -709,7 +709,7 @@ check_pgpsigs() {
for file in "${source[@]}"; do
file="$(get_filename "$file")"
- if [[ ! $file =~ .*(sig|asc) ]]; then
+ if [[ ! $file =~ \.(sig|asc)$ ]]; then
continue
fi