[pacman-dev] [PATCH] makepkg: fix missing source file detection

Allan McRae allan at archlinux.org
Sun Jan 8 07:04:20 EST 2012


Declaring the variable as local on the same line as the assignment
results in result of the assignment being returned rather than the
result of the function on the righthand side of the assignment.

Declaring the variable as local on a separate line means the result
of the function on the r.h.s. is returned and our error function
will be invoked if necessary  (although it is practically impossible
to ever trigger it...).

Signed-off-by: Allan McRae <allan at archlinux.org>
---

@Dave: is my explanation correct there?

 scripts/makepkg.sh.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index b06c78a..cfdb530 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -624,7 +624,8 @@ generate_checksums() {
 
 		local netfile
 		for netfile in "${source[@]}"; do
-			local file="$(get_filepath "$netfile")" || missing_source_file "$netfile"
+			local file
+			file="$(get_filepath "$netfile")" || missing_source_file "$netfile"
 			local sum="$(openssl dgst -${integ} "$file")"
 			sum=${sum##* }
 			(( ct )) && echo -n "$indent"
-- 
1.7.8.1



More information about the pacman-dev mailing list