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/git.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/git.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 6b618345c3..cb9fa3fb1a 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -182,9 +182,9 @@ class Git(FetchMethod): | |||
182 | if ud.usehead: | 182 | if ud.usehead: |
183 | ud.unresolvedrev['default'] = 'HEAD' | 183 | ud.unresolvedrev['default'] = 'HEAD' |
184 | 184 | ||
185 | ud.basecmd = d.getVar("FETCHCMD_git", True) or "git -c core.fsyncobjectfiles=0" | 185 | ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0" |
186 | 186 | ||
187 | ud.write_tarballs = ((d.getVar("BB_GENERATE_MIRROR_TARBALLS", True) or "0") != "0") or ud.rebaseable | 187 | ud.write_tarballs = ((d.getVar("BB_GENERATE_MIRROR_TARBALLS") or "0") != "0") or ud.rebaseable |
188 | 188 | ||
189 | ud.setup_revisons(d) | 189 | ud.setup_revisons(d) |
190 | 190 | ||
@@ -207,8 +207,8 @@ class Git(FetchMethod): | |||
207 | for name in ud.names: | 207 | for name in ud.names: |
208 | gitsrcname = gitsrcname + '_' + ud.revisions[name] | 208 | gitsrcname = gitsrcname + '_' + ud.revisions[name] |
209 | ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname) | 209 | ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname) |
210 | ud.fullmirror = os.path.join(d.getVar("DL_DIR", True), ud.mirrortarball) | 210 | ud.fullmirror = os.path.join(d.getVar("DL_DIR"), ud.mirrortarball) |
211 | gitdir = d.getVar("GITDIR", True) or (d.getVar("DL_DIR", True) + "/git2/") | 211 | gitdir = d.getVar("GITDIR") or (d.getVar("DL_DIR") + "/git2/") |
212 | ud.clonedir = os.path.join(gitdir, gitsrcname) | 212 | ud.clonedir = os.path.join(gitdir, gitsrcname) |
213 | 213 | ||
214 | ud.localfile = ud.clonedir | 214 | ud.localfile = ud.clonedir |
@@ -229,7 +229,7 @@ class Git(FetchMethod): | |||
229 | def try_premirror(self, ud, d): | 229 | def try_premirror(self, ud, d): |
230 | # If we don't do this, updating an existing checkout with only premirrors | 230 | # If we don't do this, updating an existing checkout with only premirrors |
231 | # is not possible | 231 | # is not possible |
232 | if d.getVar("BB_FETCH_PREMIRRORONLY", True) is not None: | 232 | if d.getVar("BB_FETCH_PREMIRRORONLY") is not None: |
233 | return True | 233 | return True |
234 | if os.path.exists(ud.clonedir): | 234 | if os.path.exists(ud.clonedir): |
235 | return False | 235 | return False |
@@ -418,7 +418,7 @@ class Git(FetchMethod): | |||
418 | """ | 418 | """ |
419 | pupver = ('', '') | 419 | pupver = ('', '') |
420 | 420 | ||
421 | tagregex = re.compile(d.getVar('UPSTREAM_CHECK_GITTAGREGEX', True) or "(?P<pver>([0-9][\.|_]?)+)") | 421 | tagregex = re.compile(d.getVar('UPSTREAM_CHECK_GITTAGREGEX') or "(?P<pver>([0-9][\.|_]?)+)") |
422 | try: | 422 | try: |
423 | output = self._lsremote(ud, d, "refs/tags/*") | 423 | output = self._lsremote(ud, d, "refs/tags/*") |
424 | except bb.fetch2.FetchError or bb.fetch2.NetworkAccess: | 424 | except bb.fetch2.FetchError or bb.fetch2.NetworkAccess: |