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/hg.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/hg.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/hg.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index a1419aade5..ee5b2dd6f3 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py | |||
@@ -78,15 +78,15 @@ class Hg(FetchMethod): | |||
78 | hgsrcname = '%s_%s_%s' % (ud.module.replace('/', '.'), \ | 78 | hgsrcname = '%s_%s_%s' % (ud.module.replace('/', '.'), \ |
79 | ud.host, ud.path.replace('/', '.')) | 79 | ud.host, ud.path.replace('/', '.')) |
80 | ud.mirrortarball = 'hg_%s.tar.gz' % hgsrcname | 80 | ud.mirrortarball = 'hg_%s.tar.gz' % hgsrcname |
81 | ud.fullmirror = os.path.join(d.getVar("DL_DIR", True), ud.mirrortarball) | 81 | ud.fullmirror = os.path.join(d.getVar("DL_DIR"), ud.mirrortarball) |
82 | 82 | ||
83 | hgdir = d.getVar("HGDIR", True) or (d.getVar("DL_DIR", True) + "/hg/") | 83 | hgdir = d.getVar("HGDIR") or (d.getVar("DL_DIR") + "/hg/") |
84 | ud.pkgdir = os.path.join(hgdir, hgsrcname) | 84 | ud.pkgdir = os.path.join(hgdir, hgsrcname) |
85 | ud.moddir = os.path.join(ud.pkgdir, ud.module) | 85 | ud.moddir = os.path.join(ud.pkgdir, ud.module) |
86 | ud.localfile = ud.moddir | 86 | ud.localfile = ud.moddir |
87 | ud.basecmd = d.getVar("FETCHCMD_hg", True) or "/usr/bin/env hg" | 87 | ud.basecmd = d.getVar("FETCHCMD_hg") or "/usr/bin/env hg" |
88 | 88 | ||
89 | ud.write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS", True) | 89 | ud.write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS") |
90 | 90 | ||
91 | def need_update(self, ud, d): | 91 | def need_update(self, ud, d): |
92 | revTag = ud.parm.get('rev', 'tip') | 92 | revTag = ud.parm.get('rev', 'tip') |
@@ -99,7 +99,7 @@ class Hg(FetchMethod): | |||
99 | def try_premirror(self, ud, d): | 99 | def try_premirror(self, ud, d): |
100 | # If we don't do this, updating an existing checkout with only premirrors | 100 | # If we don't do this, updating an existing checkout with only premirrors |
101 | # is not possible | 101 | # is not possible |
102 | if d.getVar("BB_FETCH_PREMIRRORONLY", True) is not None: | 102 | if d.getVar("BB_FETCH_PREMIRRORONLY") is not None: |
103 | return True | 103 | return True |
104 | if os.path.exists(ud.moddir): | 104 | if os.path.exists(ud.moddir): |
105 | return False | 105 | return False |