[bitbake-devel] [PATCH] bitbake: fetch2/npm.py: Allow shrinkwrap resolved relative URL which startswith 'http' (e.g http-proxy)

[Parthiban Nallathambi]

Ping on this patch!

On 07/18/2018 04:14 PM, Parthiban Nallathambi wrote:
> shrinkwrap resolved relative URL can start with http. For example,
> "resolved: http-proxy/-/http-proxy-${PV}.tgz" is still relative URL
> to npm registry, but starts with http.
> 
> Current if statement compares the startswith 'resolved' to 'http',
> which makes impossible to use npm download. Condtional comparison
> now strictly checks for "http://" and "https://"
> 
> Changelog since v1:
> - Use the proper conditional statement to avoid always success
> 
> Signed-off-by: Parthiban Nallathambi <pn at denx.de>
> ---
>   bitbake/lib/bb/fetch2/npm.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/bitbake/lib/bb/fetch2/npm.py b/bitbake/lib/bb/fetch2/npm.py
> index 408dfc3d03..65bf5a3644 100644
> --- a/bitbake/lib/bb/fetch2/npm.py
> +++ b/bitbake/lib/bb/fetch2/npm.py
> @@ -226,7 +226,7 @@ class Npm(FetchMethod):
>                           self._getshrinkeddependencies(obj, data['dependencies'][obj], data['dependencies'][obj]['version'], d, ud, lockdown, manifest, False)
>                           return
>           outputurl = "invalid"
> -        if ('resolved' not in data) or (not data['resolved'].startswith('http')):
> +        if ('resolved' not in data) or (not data['resolved'].startswith('http://') and not data['resolved'].startswith('https://')):
>               # will be the case for ${PN}
>               fetchcmd = "npm view %s@%s dist.tarball --registry %s" % (pkg, version, ud.registry)
>               logger.debug(2, "Found this matching URL: %s" % str(fetchcmd))
> 

-- 
Thanks,
Parthiban N