From 594c2e01e7f36476fee3ee47e2e94f60f06f2df9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Jan 2014 13:25:43 +0000 Subject: bitbake: fetch2: Improve invalid SRCREV error message The current message can be ambiguous, improve it (and also rename a variable to clean up the rest of the function). (Bitbake rev: 0c1bb7c0fce7b0f334311a2893ccb00385fa8d55) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 8b6c3eed6c..de95074c40 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -897,17 +897,12 @@ def srcrev_internal_helper(ud, d, name): raise FetchError("Conflicting revisions (%s from SRCREV and %s from the url) found, please spcify one valid value" % (srcrev, parmrev)) return parmrev - rev = srcrev - if rev == "INVALID" or not rev: - var = "SRCREV_pn-%s" % pn - if name != '': - var = "SRCREV_%s_pn-%s" % (name, pn) - raise FetchError("Please set %s to a valid value" % var, ud.url) - if rev == "AUTOINC": - rev = ud.method.latest_revision(ud, d, name) - - return rev + if srcrev == "INVALID" or not srcrev: + raise FetchError("Please set a valid SRCREV for url %s (possible key names are %s, or use a ;rev=X URL parameter)" % (str(attempts), ud.url), ud.url) + if srcrev == "AUTOINC": + srcrev = ud.method.latest_revision(ud, d, name) + return srcrev def get_checksum_file_list(d): """ Get a list of files checksum in SRC_URI -- cgit v1.2.3-54-g00ecf