diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 15:25:44 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 13:18:03 +0100 |
| commit | d865692e8b76a1da80c80788946978f150f2c34b (patch) | |
| tree | 18db3dce5617a8a95799b2d51b3a7bcf40d9bc48 | |
| parent | 410372783b22cf3ff2d8bbd80a5c3f4a1694e9a4 (diff) | |
| download | bitbake-d865692e8b76a1da80c80788946978f150f2c34b.tar.gz | |
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/perforce.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/fetch2/perforce.py b/lib/bb/fetch2/perforce.py index 9329d7277..9836bd726 100644 --- a/lib/bb/fetch2/perforce.py +++ b/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") |