]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
classes/sstate: fix file conflict message paule/bracket-fixes
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Wed, 21 Dec 2016 21:37:12 +0000 (10:37 +1300)
committerPaul Eggleton <paul.eggleton@linux.intel.com>
Thu, 22 Dec 2016 02:17:06 +0000 (15:17 +1300)
commitfc78e15323acd013c7d77dfb991bf36f7784a9a5
tree4bcbb260af53401dde97e4d03f23903912bd5bcf
parent367afd4ed8b09d73dee981a214fb3ecdfc7e3ea1
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

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
meta/classes/sstate.bbclass