diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-12-22 15:19:59 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:27:00 +0000 |
| commit | 4675ce43496898fccbac738835d7e92b1cca648e (patch) | |
| tree | a653f8f530e29615d1977b8d968bcc5d0c7f91bc /.templateconf | |
| parent | fd8a57861024fc82e15a2a4ec8c20ed0ebb242f6 (diff) | |
| download | openembedded-core-4675ce43496898fccbac738835d7e92b1cca648e.tar.gz | |
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>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to '.templateconf')
0 files changed, 0 insertions, 0 deletions