summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:53 +0100
commit69b69193411849de71cf7c81735c3239e28a2940 (patch)
tree054081264a49c9aa3002bc358ab0c4d7b7239015 /bitbake/lib/bb/fetch2
parent86d30d756a60d181a95cf07041920a367a0cd0ba (diff)
downloadpoky-69b69193411849de71cf7c81735c3239e28a2940.tar.gz
bitbake: bitbake: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` (Bitbake rev: 659ef95c9b8aced3c4ded81c48bcc0fbde4d429f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
-rw-r--r--bitbake/lib/bb/fetch2/clearcase.py4
-rw-r--r--bitbake/lib/bb/fetch2/perforce.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 958469db62..cc772df498 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1003,7 +1003,7 @@ def trusted_network(d, url):
1003 if d.getVar('BB_NO_NETWORK', True) == "1": 1003 if d.getVar('BB_NO_NETWORK', True) == "1":
1004 return True 1004 return True
1005 1005
1006 pkgname = d.expand(d.getVar('PN')) 1006 pkgname = d.expand(d.getVar('PN', False))
1007 trusted_hosts = d.getVarFlag('BB_ALLOWED_NETWORKS', pkgname) 1007 trusted_hosts = d.getVarFlag('BB_ALLOWED_NETWORKS', pkgname)
1008 1008
1009 if not trusted_hosts: 1009 if not trusted_hosts:
diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/bitbake/lib/bb/fetch2/clearcase.py
index bfca2f7bcf..ba83e7cb60 100644
--- a/bitbake/lib/bb/fetch2/clearcase.py
+++ b/bitbake/lib/bb/fetch2/clearcase.py
@@ -9,7 +9,7 @@ Usage in the recipe:
9 9
10 SRC_URI = "ccrc://cc.example.org/ccrc;vob=/example_vob;module=/example_module" 10 SRC_URI = "ccrc://cc.example.org/ccrc;vob=/example_vob;module=/example_module"
11 SRCREV = "EXAMPLE_CLEARCASE_TAG" 11 SRCREV = "EXAMPLE_CLEARCASE_TAG"
12 PV = "${@d.getVar("SRCREV").replace("/", "+")}" 12 PV = "${@d.getVar("SRCREV", False).replace("/", "+")}"
13 13
14The fetcher uses the rcleartool or cleartool remote client, depending on which one is available. 14The fetcher uses the rcleartool or cleartool remote client, depending on which one is available.
15 15
@@ -113,7 +113,7 @@ class ClearCase(FetchMethod):
113 if data.getVar("SRCREV", d, True) == "INVALID": 113 if data.getVar("SRCREV", d, True) == "INVALID":
114 raise FetchError("Set a valid SRCREV for the clearcase fetcher in your recipe, e.g. SRCREV = \"/main/LATEST\" or any other label of your choice.") 114 raise FetchError("Set a valid SRCREV for the clearcase fetcher in your recipe, e.g. SRCREV = \"/main/LATEST\" or any other label of your choice.")
115 115
116 ud.label = d.getVar("SRCREV") 116 ud.label = d.getVar("SRCREV", False)
117 ud.customspec = d.getVar("CCASE_CUSTOM_CONFIG_SPEC", True) 117 ud.customspec = d.getVar("CCASE_CUSTOM_CONFIG_SPEC", True)
118 118
119 ud.server = "%s://%s%s" % (ud.proto, ud.host, ud.path) 119 ud.server = "%s://%s%s" % (ud.proto, ud.host, ud.path)
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py
index d079a33c62..5a6631a384 100644
--- a/bitbake/lib/bb/fetch2/perforce.py
+++ b/bitbake/lib/bb/fetch2/perforce.py
@@ -48,7 +48,7 @@ class Perforce(FetchMethod):
48 (user, pswd, host, port) = path.split('@')[0].split(":") 48 (user, pswd, host, port) = path.split('@')[0].split(":")
49 path = path.split('@')[1] 49 path = path.split('@')[1]
50 else: 50 else:
51 (host, port) = d.getVar('P4PORT').split(':') 51 (host, port) = d.getVar('P4PORT', False).split(':')
52 user = "" 52 user = ""
53 pswd = "" 53 pswd = ""
54 54