diff options
| author |   Darren Hart <dvhart@linux.intel.com> | 2013-02-05 02:31:37 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-05 15:22:45 +0000 |
| commit | ee1f126ad5cb2c6af66815e55720257a1efc5a49 (patch) | |
| tree | 2fb512a8e1f4397c85d51010af093b2c79121f17 /bitbake | |
| parent | 97b7e4f46e2116e9cbaa02efa7d37321fd32b368 (diff) | |
| download | openembedded-core-contrib-ee1f126ad5cb2c6af66815e55720257a1efc5a49.tar.gz | |
bitbake: bitbake: fetch2: Print the complete SRCREV variable name when INVALID
If a particular SRCREV (say for a particular branch) is missing, the
fetcher will currently just report an obtuse error about the "SRCREV"
being invalid. If there is more information is to be had (say from name,
i.e. branch, and pn) then display that as well.
The new error looks something like this:
ERROR: ExpansionError during parsing /home/dvhart/source/poky/meta/recipes-kernel/linux/linux-yocto_3.4.bb: Failure expanding variable do_patch: ExpansionError: Failure expanding variable SRCPV, expression was ${@bb.fetch2.get_srcrev(d)} which triggered exception FetchError: Fetcher failure for URL: 'git://otcgit.jf.intel.com/dvhart/linux-yocto-minnow-3.4.git;protocol=git;nocheckout=1;branch=standard/minnow,meta,emgd-1.14;name=machine,meta,emgd'. Please set SRCREV_emgd_pn-linux-yocto to a valid value
Note the variable listed as invalid is
"SRCREV_emgd_pn-linux-yocto", making it explicit what is wrong.
(Bitbake rev: 63774f5b4edb999300bddd891233f6050f4af877)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: bitbake-devel@lists.openembedded.org
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 47463561e3..cba45d0a4e 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -650,11 +650,14 @@ def srcrev_internal_helper(ud, d, name): if not rev: rev = d.getVar("SRCREV_%s" % name, True) if not rev: - rev = d.getVar("SRCREV_pn-%s" % pn, True) + rev = d.getVar("SRCREV_pn-%s" % pn, True) if not rev: rev = d.getVar("SRCREV", True) if rev == "INVALID": - raise FetchError("Please set SRCREV to a valid value", ud.url) + 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.url, ud, d, name) |