From 50067e069c8cbc0d339819494f22ae7623d47aa6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 11 May 2014 15:25:44 +0100 Subject: bitbake: fetch2/perforce: Ensure command has a default Ensure there is default command available if FETCHCMD_p4 isn't set. Also clean up the getVar references whilst here. (Bitbake rev: d150226d11d5f041f78c8c3ce4abc5465dbc81d8) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/perforce.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bitbake/lib/bb/fetch2/perforce.py') diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index 9329d72779..9836bd7268 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py @@ -48,7 +48,7 @@ class Perforce(FetchMethod): (user, pswd, host, port) = path.split('@')[0].split(":") path = path.split('@')[1] else: - (host, port) = data.getVar('P4PORT', d).split(':') + (host, port) = d.getVar('P4PORT').split(':') user = "" pswd = "" @@ -81,7 +81,7 @@ class Perforce(FetchMethod): if host: p4opt += " -p %s" % (host) - p4date = data.getVar("P4DATE", d, True) + p4date = d.getVar("P4DATE", True) if "revision" in parm: depot += "#%s" % (parm["revision"]) elif "label" in parm: @@ -89,7 +89,7 @@ class Perforce(FetchMethod): elif p4date: depot += "@%s" % (p4date) - p4cmd = data.getVar('FETCHCMD_p4', d, True) + p4cmd = d.getVar('FETCHCMD_p4', True) or "p4" logger.debug(1, "Running %s%s changes -m 1 %s", p4cmd, p4opt, depot) p4file, errors = bb.process.run("%s%s changes -m 1 %s" % (p4cmd, p4opt, depot)) cset = p4file.strip() @@ -145,7 +145,7 @@ class Perforce(FetchMethod): if host: p4opt += " -p %s" % (host) - p4cmd = data.getVar('FETCHCMD_p4', d, True) + p4cmd = d.getVar('FETCHCMD_p4', True) or "p4" # create temp directory logger.debug(2, "Fetch: creating temporary directory") -- cgit v1.2.3-54-g00ecf