]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
classes/sstate: fix file conflict message
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Thu, 22 Dec 2016 02:19:59 +0000 (15:19 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 9 Jan 2017 13:39:11 +0000 (13:39 +0000)
commit976373be1216c8e610718de4e8023a5ca73f40c7
tree7a9b9940ac79b8aadf27bee14394ea3de46b7f97
parent3d6c667e5455c2333dedd7a9b5040c51b0ccdd8f
classes/sstate: fix file conflict message

* Fix not decoding output from grep ("Matched in b'manifest...')
* Fix showing "Matched in b''" if no match (show "not matched to any
  task" instead)
* Drop the filtering out of .populate-sysroot from matched manifest
  names - it should have been .populate_sysroot so it doesn't work, and
  in any case the value of removing the task name is questionable given
  that we aren't removing it for any other task, and that the rest of
  the filename isn't only the task name, we might as well have the whole
  thing. At least then you can do a find on that exact name without
  wildcards and find it.
* Fix indenting of file list entries and indent "matched in" further
  underneath
* Minor punctuation fixes

(From OE-Core rev: 4675ce43496898fccbac738835d7e92b1cca648e)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass