[pacman-dev] [PATCH] makepkg: fix overzealous PGP signature file matching

Dan McGee dan at archlinux.org
Thu Sep 1 12:44:16 EDT 2011


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 at archlinux.org>
---
 scripts/makepkg.sh.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e74e5c8..2f06b9b 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
 
-- 
1.7.6



More information about the pacman-dev mailing list