summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorChad Nelson <cnelson711@gmail.com>2014-09-15 08:01:42 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-23 20:21:12 +0100
commita94574f189a2840ddb9cf78c050384d4c833d291 (patch)
tree949588e3d6e21205751293f2728f9377cc667435 /bitbake/lib/bb/fetch2
parent7ca8b65c3c9fdbfa2de9fbae0bcd36a32d956552 (diff)
downloadpoky-a94574f189a2840ddb9cf78c050384d4c833d291.tar.gz
bitbake: fetch2/perforce: Use replace (1 line) instead of find (3 lines)
(Bitbake rev: 5bf5a937b26896bedbfea78dd1d62bce5a26ac2a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/perforce.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py
index 47a4a5d3d4..d079a33c62 100644
--- a/bitbake/lib/bb/fetch2/perforce.py
+++ b/bitbake/lib/bb/fetch2/perforce.py
@@ -103,19 +103,15 @@ class Perforce(FetchMethod):
103 def urldata_init(self, ud, d): 103 def urldata_init(self, ud, d):
104 (host, path, user, pswd, parm) = Perforce.doparse(ud.url, d) 104 (host, path, user, pswd, parm) = Perforce.doparse(ud.url, d)
105 105
106 base = path 106 base_path = path.replace('/...', '')
107 which = path.find('/...') 107 base_path = self._strip_leading_slashes(base_path)
108 if which != -1:
109 base = path[:which]
110
111 base = self._strip_leading_slashes(base)
112 108
113 if "label" in parm: 109 if "label" in parm:
114 version = parm["label"] 110 version = parm["label"]
115 else: 111 else:
116 version = Perforce.getcset(d, path, host, user, pswd, parm) 112 version = Perforce.getcset(d, path, host, user, pswd, parm)
117 113
118 ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), version), d) 114 ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base_path.replace('/', '.'), version), d)
119 115
120 def download(self, ud, d): 116 def download(self, ud, d):
121 """ 117 """