From 3d4e95e5262a8886a5e775c999fa48ed6a78e179 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 21 Nov 2017 23:34:47 -0500 Subject: libmakepkg/integrity: fix git signatures not seen with multiple files In eaa82b4d0775252856a4e54a6f2a9ea191cf0b8f source_has_signature() was modified to check if git repositories are marked as signed. However, due to a typo the unused variable $netfile was checked. This worked as long as the last source element was marked as signed, due to $netfile being mistakenly set as a global in check_vcs_software(), but usually failed with multiple sources. Break this more consistently by properly declaring $netfile as a local variable in check_vcs_software() which it should be regardless. Fix it again by completely moving over to $netfile in source_has_signature() as netfile is more descriptive of the current state. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/makepkg.sh.in') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e5ebfee4..8251e71b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -914,7 +914,7 @@ get_vcsclient() { } check_vcs_software() { - local all_sources all_deps deps ret=0 + local netfile all_sources all_deps deps ret=0 if (( SOURCEONLY == 1 )); then # we will not download VCS sources -- cgit v1.2.3-24-g4f1b