• Eli Schwartz's avatar
    makepkg: fix regression that broke extraction of file:// sources · 349c22d0
    Eli Schwartz authored and Allan McRae's avatar Allan McRae committed
    In commit 9c817b65
    
     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's avatarEli Schwartz <eschwartz@archlinux.org>
    Signed-off-by: Allan McRae's avatarAllan McRae <allan@archlinux.org>
    349c22d0