summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-11-01 21:48:17 +1000
committerAllan McRae <allan@archlinux.org>2013-11-15 11:02:12 +1000
commitda8cd388c4fd95d1748285e4d6bd549c776ef5e1 (patch)
treefaf312e3e6b017253a102ed62d9ebe9a13be821c /scripts
parent57090d8cba65988b822a215947a5fb44d55790d0 (diff)
downloadpacman-da8cd388c4fd95d1748285e4d6bd549c776ef5e1.tar.xz
Return zero from extract_file with local source file
The call to bsdtar to check if a file needs extracted returns 1 if it does not. We then propegate this return value accidentally which can cause makepkg to report an error later on. Explicitly return 0 in this case. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e01e7ab3..af97c3b9 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -419,7 +419,7 @@ extract_file() {
if bsdtar -tf "$file" -q '*' &>/dev/null; then
cmd="bsdtar"
else
- return
+ return 0
fi ;;
esac