New subject: [pacman-dev] [PATCH] makepkg: split source elements when looking for sigs

11 Dec 2011

Allows renamed .asc/.sig files to be still discovered by makepkg. This
is needed for a package such as PuTTY, which provides abnormally named
sig files (.DSA and .RSA) which are valid input for gpg --verify.

Signed-off-by: Dave Reisner 
---
Related: do we want to natively support .SIG and .ASC as well? Or would we be
content with this patch as a workaround for "abnormal" sig files like that?

 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 a0a94fe..a4a3d13 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -331,10 +331,10 @@ in_array() {
 	return 1 # Not Found
 }
 
-source_has_signatures(){
+source_has_signatures() {
 	local file
 	for file in "${source[@]}"; do
-		if [[ $file = *.@(sig?(n)|asc) ]]; then
+		if [[ ${file%%::*} = *.@(sig?(n)|asc) ]]; then
 			return 0
 		fi
 	done
-- 
1.7.8

    

[pacman-dev] [PATCH] makepkg: split source elements when looking for sigs

Dave Reisner

Allan McRae

Eric Bélanger

Allan McRae

Allan McRae

tags

participants (3)