From 07ecd40a1a1ffba5e5b1c3edd199a0f159496c48 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Fri, 30 Sep 2011 13:40:00 +1000 Subject: pacman-key: return 0 from get_from if default value used This prevents the error trap being set off when GPGDir is commented in pacman.conf. Bug introduced in 507b01b9. Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/pacman-key.sh.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 86429285..e293d496 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -106,7 +106,10 @@ get_from() { return 0 fi done < "$1" - printf '%s\n' "$3" + if [[ -n "$3" ]]; then + printf '%s\n' "$3" + return 0 + fi return 1 } -- cgit v1.2.3-24-g4f1b