diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-03 10:41:41 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-05 10:36:53 -0800 |
commit | ff73b02a7203623e5edfaaa10df17eaa63cf4ed3 (patch) | |
tree | d32fbf33c74a0a9c60f3676d1aa46bb6812fa757 /bitbake/lib/bb/fetch | |
parent | 082cc604f5eb1a7f6d3c4dda01154cfa93b0d660 (diff) | |
download | poky-ff73b02a7203623e5edfaaa10df17eaa63cf4ed3.tar.gz |
meta/classes: Convert to use appendVar and appendVarFlags
(From OE-Core rev: 3b57de68e70e77dbc03c0616a83a29a2e99e40b4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index ea98019207..18988646b9 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py | |||
@@ -154,7 +154,7 @@ def fetcher_init(d): | |||
154 | Calls before this must not hit the cache. | 154 | Calls before this must not hit the cache. |
155 | """ | 155 | """ |
156 | # When to drop SCM head revisions controlled by user policy | 156 | # When to drop SCM head revisions controlled by user policy |
157 | srcrev_policy = d.getVar('BB_SRCREV_POLICY', 1) or "clear" | 157 | srcrev_policy = d.getVar('BB_SRCREV_POLICY', True) or "clear" |
158 | if srcrev_policy == "cache": | 158 | if srcrev_policy == "cache": |
159 | logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) | 159 | logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) |
160 | elif srcrev_policy == "clear": | 160 | elif srcrev_policy == "clear": |
@@ -200,7 +200,7 @@ def fetcher_compare_revisions(d): | |||
200 | def init(urls, d, setup = True): | 200 | def init(urls, d, setup = True): |
201 | urldata = {} | 201 | urldata = {} |
202 | 202 | ||
203 | fn = d.getVar('FILE', 1) | 203 | fn = d.getVar('FILE', True) |
204 | if fn in urldata_cache: | 204 | if fn in urldata_cache: |
205 | urldata = urldata_cache[fn] | 205 | urldata = urldata_cache[fn] |
206 | 206 | ||
@@ -261,7 +261,7 @@ def go(d, urls = None): | |||
261 | init must have previously been called | 261 | init must have previously been called |
262 | """ | 262 | """ |
263 | if not urls: | 263 | if not urls: |
264 | urls = d.getVar("SRC_URI", 1).split() | 264 | urls = d.getVar("SRC_URI", True).split() |
265 | urldata = init(urls, d, True) | 265 | urldata = init(urls, d, True) |
266 | 266 | ||
267 | for u in urls: | 267 | for u in urls: |
@@ -383,7 +383,7 @@ def get_srcrev(d): | |||
383 | scms = [] | 383 | scms = [] |
384 | 384 | ||
385 | # Only call setup_localpath on URIs which supports_srcrev() | 385 | # Only call setup_localpath on URIs which supports_srcrev() |
386 | urldata = init(d.getVar('SRC_URI', 1).split(), d, False) | 386 | urldata = init(d.getVar('SRC_URI', True).split(), d, False) |
387 | for u in urldata: | 387 | for u in urldata: |
388 | ud = urldata[u] | 388 | ud = urldata[u] |
389 | if ud.method.supports_srcrev(): | 389 | if ud.method.supports_srcrev(): |
@@ -404,7 +404,7 @@ def get_srcrev(d): | |||
404 | # | 404 | # |
405 | # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT | 405 | # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT |
406 | # | 406 | # |
407 | format = d.getVar('SRCREV_FORMAT', 1) | 407 | format = d.getVar('SRCREV_FORMAT', True) |
408 | if not format: | 408 | if not format: |
409 | logger.error("The SRCREV_FORMAT variable must be set when multiple SCMs are used.") | 409 | logger.error("The SRCREV_FORMAT variable must be set when multiple SCMs are used.") |
410 | raise ParameterError | 410 | raise ParameterError |