summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/fetch2
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-02 23:49:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 23:47:49 +0000
commit4628fe12e7f2767d243949197c8326e3b7396301 (patch)
treef65671f46417a7fc5710edec657e22917c2b5f30 /bitbake/lib/bb/fetch2
parentb98866d003eb1287909ea74d594cdd12f28466f2 (diff)
downloadpoky-4628fe12e7f2767d243949197c8326e3b7396301.tar.gz
bitbake: lib/bb: Add expansion parameter to getVarFlag
This sets the scene for removing the default False for expansion from getVarFlag. This would later allow True to become the expand default. On the most part this is an automatic translation with: sed -e 's:\(\.getVarFlag([^,()]*, [^,()]*\)):\1, False):g' -i `grep -ril getVar *` There should be no functional change from this patch. (Bitbake rev: 7c3b99c6a716095af3ffce0b15110e91fb49c913) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index dd1a1978d1..c3dcfd2ccb 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1002,7 +1002,7 @@ def trusted_network(d, url):
1002 return True 1002 return True
1003 1003
1004 pkgname = d.expand(d.getVar('PN', False)) 1004 pkgname = d.expand(d.getVar('PN', False))
1005 trusted_hosts = d.getVarFlag('BB_ALLOWED_NETWORKS', pkgname) 1005 trusted_hosts = d.getVarFlag('BB_ALLOWED_NETWORKS', pkgname, False)
1006 1006
1007 if not trusted_hosts: 1007 if not trusted_hosts:
1008 trusted_hosts = d.getVar('BB_ALLOWED_NETWORKS', True) 1008 trusted_hosts = d.getVar('BB_ALLOWED_NETWORKS', True)
@@ -1185,13 +1185,13 @@ class FetchData(object):
1185 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: 1185 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
1186 self.md5_expected = None 1186 self.md5_expected = None
1187 else: 1187 else:
1188 self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name) 1188 self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name, False)
1189 if self.sha256_name in self.parm: 1189 if self.sha256_name in self.parm:
1190 self.sha256_expected = self.parm[self.sha256_name] 1190 self.sha256_expected = self.parm[self.sha256_name]
1191 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: 1191 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
1192 self.sha256_expected = None 1192 self.sha256_expected = None
1193 else: 1193 else:
1194 self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name) 1194 self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name, False)
1195 self.ignore_checksums = False 1195 self.ignore_checksums = False
1196 1196
1197 self.names = self.parm.get("name",'default').split(',') 1197 self.names = self.parm.get("name",'default').split(',')