From ff73b02a7203623e5edfaaa10df17eaa63cf4ed3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 10:41:41 +0000 Subject: meta/classes: Convert to use appendVar and appendVarFlags (From OE-Core rev: 3b57de68e70e77dbc03c0616a83a29a2e99e40b4) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/bb/fetch/__init__.py') 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): Calls before this must not hit the cache. """ # When to drop SCM head revisions controlled by user policy - srcrev_policy = d.getVar('BB_SRCREV_POLICY', 1) or "clear" + srcrev_policy = d.getVar('BB_SRCREV_POLICY', True) or "clear" if srcrev_policy == "cache": logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy) elif srcrev_policy == "clear": @@ -200,7 +200,7 @@ def fetcher_compare_revisions(d): def init(urls, d, setup = True): urldata = {} - fn = d.getVar('FILE', 1) + fn = d.getVar('FILE', True) if fn in urldata_cache: urldata = urldata_cache[fn] @@ -261,7 +261,7 @@ def go(d, urls = None): init must have previously been called """ if not urls: - urls = d.getVar("SRC_URI", 1).split() + urls = d.getVar("SRC_URI", True).split() urldata = init(urls, d, True) for u in urls: @@ -383,7 +383,7 @@ def get_srcrev(d): scms = [] # Only call setup_localpath on URIs which supports_srcrev() - urldata = init(d.getVar('SRC_URI', 1).split(), d, False) + urldata = init(d.getVar('SRC_URI', True).split(), d, False) for u in urldata: ud = urldata[u] if ud.method.supports_srcrev(): @@ -404,7 +404,7 @@ def get_srcrev(d): # # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT # - format = d.getVar('SRCREV_FORMAT', 1) + format = d.getVar('SRCREV_FORMAT', True) if not format: logger.error("The SRCREV_FORMAT variable must be set when multiple SCMs are used.") raise ParameterError -- cgit v1.2.3-54-g00ecf