diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2019-11-26 01:07:56 +0100 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2019-11-26 01:22:16 +0100 |
commit | 349c22d043290ccd0cce9f30981f5415e295442a (patch) | |
tree | 7b7ebb20c2810873aab51034cba36dcc09affbee /Makefile.am | |
parent | 55233b69c74a087ff405d3f768e5303dacaf8129 (diff) | |
download | pacman-349c22d043290ccd0cce9f30981f5415e295442a.tar.gz pacman-349c22d043290ccd0cce9f30981f5415e295442a.tar.xz |
makepkg: fix regression that broke extraction of file:// sources
In commit 9c817b654996249b8022e189ee7e2692f4668431 we made these sources
extendable, and heuristically determined the correct extraction
functions to use. But our fallback for protos that didn't have an exact
extract_* function didn't take into account that 'extract_file' matches
an actual proto... so we passed the netfile in while the function
expected a file.
Solution: the function should expect a netfile too, thereby allowing us
to delay an attempted resolution of netfile -> file, to the one case
where it is actually used. This makes us slightly more efficient in the
non-file case, makes our functions a bit more consistent, and makes
file:// extraction work again.
Fixes FS#64648
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions