diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (patch) | |
tree | dc19c8ecb8e0b04ba5eafd27a7679bb55585a868 /bitbake/lib/bb/fetch2/clearcase.py | |
parent | 1d0c124cdf0282b8d139063409e40982f0ec9888 (diff) | |
download | poky-1fce7ecbbb004a5ad82da3eef79cfd52b276708d.tar.gz |
bitbake: bitbake: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/clearcase.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/clearcase.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/clearcase.py b/bitbake/lib/bb/fetch2/clearcase.py index d35b2dabeb..8df8f53d2f 100644 --- a/bitbake/lib/bb/fetch2/clearcase.py +++ b/bitbake/lib/bb/fetch2/clearcase.py | |||
@@ -108,13 +108,13 @@ class ClearCase(FetchMethod): | |||
108 | else: | 108 | else: |
109 | ud.module = "" | 109 | ud.module = "" |
110 | 110 | ||
111 | ud.basecmd = d.getVar("FETCHCMD_ccrc", True) or spawn.find_executable("cleartool") or spawn.find_executable("rcleartool") | 111 | ud.basecmd = d.getVar("FETCHCMD_ccrc") or spawn.find_executable("cleartool") or spawn.find_executable("rcleartool") |
112 | 112 | ||
113 | if d.getVar("SRCREV", True) == "INVALID": | 113 | if d.getVar("SRCREV") == "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", False) | 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") |
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) |
120 | 120 | ||
@@ -124,7 +124,7 @@ class ClearCase(FetchMethod): | |||
124 | 124 | ||
125 | ud.viewname = "%s-view%s" % (ud.identifier, d.getVar("DATETIME", d, True)) | 125 | ud.viewname = "%s-view%s" % (ud.identifier, d.getVar("DATETIME", d, True)) |
126 | ud.csname = "%s-config-spec" % (ud.identifier) | 126 | ud.csname = "%s-config-spec" % (ud.identifier) |
127 | ud.ccasedir = os.path.join(d.getVar("DL_DIR", True), ud.type) | 127 | ud.ccasedir = os.path.join(d.getVar("DL_DIR"), ud.type) |
128 | ud.viewdir = os.path.join(ud.ccasedir, ud.viewname) | 128 | ud.viewdir = os.path.join(ud.ccasedir, ud.viewname) |
129 | ud.configspecfile = os.path.join(ud.ccasedir, ud.csname) | 129 | ud.configspecfile = os.path.join(ud.ccasedir, ud.csname) |
130 | ud.localfile = "%s.tar.gz" % (ud.identifier) | 130 | ud.localfile = "%s.tar.gz" % (ud.identifier) |
@@ -144,7 +144,7 @@ class ClearCase(FetchMethod): | |||
144 | self.debug("configspecfile = %s" % ud.configspecfile) | 144 | self.debug("configspecfile = %s" % ud.configspecfile) |
145 | self.debug("localfile = %s" % ud.localfile) | 145 | self.debug("localfile = %s" % ud.localfile) |
146 | 146 | ||
147 | ud.localfile = os.path.join(d.getVar("DL_DIR", True), ud.localfile) | 147 | ud.localfile = os.path.join(d.getVar("DL_DIR"), ud.localfile) |
148 | 148 | ||
149 | def _build_ccase_command(self, ud, command): | 149 | def _build_ccase_command(self, ud, command): |
150 | """ | 150 | """ |