From 86ef4e65ce18b71dc69643586bd2aa8f48703171 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Jan 2014 13:10:46 +0000 Subject: [PATCH] fetch2: Clean up srcrev_internal_helper Currently INVALID and None are checked as incorrect values under different circumstances. This code standardises those checks to be consistent. We should phase out the use of "INVALID". Signed-off-by: Richard Purdie --- lib/bb/fetch2/__init__.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index f2a9f15fd9c..f4cff032256 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -873,17 +873,24 @@ def srcrev_internal_helper(ud, d, name): if 'tag' in ud.parm: return ud.parm['tag'] - rev = None + srcrev = None pn = d.getVar("PN", True) + attempts = [] + if name != '' and pn: + attempts.append("SRCREV_%s_pn-%s" % (name, pn)) if name != '': - rev = d.getVar("SRCREV_%s_pn-%s" % (name, pn), True) - if not rev: - rev = d.getVar("SRCREV_%s" % name, True) - if not rev: - rev = d.getVar("SRCREV_pn-%s" % pn, True) - if not rev: - rev = d.getVar("SRCREV", True) - if rev == "INVALID": + attempts.append("SRCREV_%s" % name) + if pn: + attempts.append("SRCREV_pn-%s" % pn) + attempts.append("SRCREV") + + for a in attempts: + srcrev = d.getVar(a, True) + if srcrev and srcrev != "INVALID": + break + + rev = srcrev + if rev == "INVALID" or not rev: var = "SRCREV_pn-%s" % pn if name != '': var = "SRCREV_%s_pn-%s" % (name, pn) -- 2.47.3