From a94574f189a2840ddb9cf78c050384d4c833d291 Mon Sep 17 00:00:00 2001 From: Chad Nelson Date: Mon, 15 Sep 2014 08:01:42 -0500 Subject: bitbake: fetch2/perforce: Use replace (1 line) instead of find (3 lines) (Bitbake rev: 5bf5a937b26896bedbfea78dd1d62bce5a26ac2a) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/perforce.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 47a4a5d..d079a33 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py @@ -103,19 +103,15 @@ class Perforce(FetchMethod): def urldata_init(self, ud, d): (host, path, user, pswd, parm) = Perforce.doparse(ud.url, d) - base = path - which = path.find('/...') - if which != -1: - base = path[:which] - - base = self._strip_leading_slashes(base) + base_path = path.replace('/...', '') + base_path = self._strip_leading_slashes(base_path) if "label" in parm: version = parm["label"] else: version = Perforce.getcset(d, path, host, user, pswd, parm) - ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), version), d) + ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base_path.replace('/', '.'), version), d) def download(self, ud, d): """ -- cgit v1.1