diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | ddaac5e4e3ebe71cb279a33a6585b3e8a8790e55 (patch) | |
tree | 5dc9c0d3e1da1edacad1e6b8748c4db22026f011 /bitbake/lib/bb/fetch2 | |
parent | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (diff) | |
download | poky-ddaac5e4e3ebe71cb279a33a6585b3e8a8790e55.tar.gz |
bitbake: bitbake: remove True option to getVarFlag calls
getVarFlag() now defaults to expanding by default, thus remove the
True option from getVarFlag() calls with a regex search and
replace.
Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)
(Bitbake rev: c19baa8c19ea8ab9b9b64fd30298d8764c6fd2cd)
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')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index ced43630ea..2bb41a4a94 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1180,13 +1180,13 @@ class FetchData(object): | |||
1180 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: | 1180 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: |
1181 | self.md5_expected = None | 1181 | self.md5_expected = None |
1182 | else: | 1182 | else: |
1183 | self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name, True) | 1183 | self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name) |
1184 | if self.sha256_name in self.parm: | 1184 | if self.sha256_name in self.parm: |
1185 | self.sha256_expected = self.parm[self.sha256_name] | 1185 | self.sha256_expected = self.parm[self.sha256_name] |
1186 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: | 1186 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: |
1187 | self.sha256_expected = None | 1187 | self.sha256_expected = None |
1188 | else: | 1188 | else: |
1189 | self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name, True) | 1189 | self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name) |
1190 | self.ignore_checksums = False | 1190 | self.ignore_checksums = False |
1191 | 1191 | ||
1192 | self.names = self.parm.get("name",'default').split(',') | 1192 | self.names = self.parm.get("name",'default').split(',') |