(PRE)MIRRORS: fix pattern for npm:// without slash
For URIs with the npm:// transport but with no other slash in it, the common MIRRORS and PREMIRRORS pattern of npm://.*/.* fails to match. Make the last slash in the pattern optional in the mirros.bbclass and own-mirrors.bbclass classes. Many URIs with the npm:// transport have no slash after the host part: npm://registry.npmjs.org;name=foo;version=0.1.2 This means that MIRRORS and PREMIRRORS containing entries like the first one will not match these URIs: npm://.*/.* # fails to match npm://.*/?.* # matches this and URIs with path components For normal regular expressions, a pattern like 'npm://.*(/.*)?' would probably be preferred, but that won't work here: the pattern gets split into the substrings 'npm', '.*(' and '/.*)?', which are not valid regular expressions individually. (From OE-Core rev: 0d1e2b4507af28fc451b8fa94130a39ac342637d) (From OE-Core rev: 1f5675a43e1781635fee15cc3674143c195da169) Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
23ea6ac574
commit
873a4eca11
|
@ -54,7 +54,7 @@ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
||||||
osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
||||||
https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
||||||
ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
||||||
npm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
npm://.*/?.* http://downloads.yoctoproject.org/mirror/sources/ \n \
|
||||||
cvs://.*/.* http://sources.openembedded.org/ \n \
|
cvs://.*/.* http://sources.openembedded.org/ \n \
|
||||||
svn://.*/.* http://sources.openembedded.org/ \n \
|
svn://.*/.* http://sources.openembedded.org/ \n \
|
||||||
git://.*/.* http://sources.openembedded.org/ \n \
|
git://.*/.* http://sources.openembedded.org/ \n \
|
||||||
|
@ -64,7 +64,7 @@ p4://.*/.* http://sources.openembedded.org/ \n \
|
||||||
osc://.*/.* http://sources.openembedded.org/ \n \
|
osc://.*/.* http://sources.openembedded.org/ \n \
|
||||||
https?$://.*/.* http://sources.openembedded.org/ \n \
|
https?$://.*/.* http://sources.openembedded.org/ \n \
|
||||||
ftp://.*/.* http://sources.openembedded.org/ \n \
|
ftp://.*/.* http://sources.openembedded.org/ \n \
|
||||||
npm://.*/.* http://sources.openembedded.org/ \n \
|
npm://.*/?.* http://sources.openembedded.org/ \n \
|
||||||
${CPAN_MIRROR} http://cpan.metacpan.org/ \n \
|
${CPAN_MIRROR} http://cpan.metacpan.org/ \n \
|
||||||
${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \
|
${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \
|
||||||
"
|
"
|
||||||
|
|
|
@ -9,5 +9,5 @@ p4://.*/.* ${SOURCE_MIRROR_URL}
|
||||||
osc://.*/.* ${SOURCE_MIRROR_URL}
|
osc://.*/.* ${SOURCE_MIRROR_URL}
|
||||||
https?$://.*/.* ${SOURCE_MIRROR_URL}
|
https?$://.*/.* ${SOURCE_MIRROR_URL}
|
||||||
ftp://.*/.* ${SOURCE_MIRROR_URL}
|
ftp://.*/.* ${SOURCE_MIRROR_URL}
|
||||||
npm://.*/.* ${SOURCE_MIRROR_URL}
|
npm://.*/?.* ${SOURCE_MIRROR_URL}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue