summaryrefslogtreecommitdiffstats
path: root/meta/classes/own-mirrors.bbclass
diff options
context:
space:
mode:
authorOlaf Mandel <o.mandel@menlosystems.com>2017-08-25 17:01:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 11:14:26 +0100
commit0731fd41dbbe8d2dd7118219cd12bb7a73fed4fd (patch)
tree62702be2e422863187cf5dabe8e050b051864f04 /meta/classes/own-mirrors.bbclass
parenta3211222b28cad850db6b763d9c20ff55afecdb0 (diff)
downloadpoky-0731fd41dbbe8d2dd7118219cd12bb7a73fed4fd.tar.gz
poky-0731fd41dbbe8d2dd7118219cd12bb7a73fed4fd.tar.bz2
poky-0731fd41dbbe8d2dd7118219cd12bb7a73fed4fd.zip
(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) Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/own-mirrors.bbclass')
-rw-r--r--meta/classes/own-mirrors.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index 12b42675bc..0296d545be 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -9,5 +9,5 @@ p4://.*/.* ${SOURCE_MIRROR_URL}
osc://.*/.* ${SOURCE_MIRROR_URL}
https?$://.*/.* ${SOURCE_MIRROR_URL}
ftp://.*/.* ${SOURCE_MIRROR_URL}
-npm://.*/.* ${SOURCE_MIRROR_URL}
+npm://.*/?.* ${SOURCE_MIRROR_URL}
}