diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-10-29 13:54:51 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:27:13 +0000 |
| commit | f948dbf2e7cdd8a821905398e39b4a79f5c92a57 (patch) | |
| tree | 0cd72902582c1b75e2adf9a11cddd8e25fb70869 /meta | |
| parent | 944fb2fd0268ee31be7acca4ad56681d5cbb7dfd (diff) | |
| download | poky-f948dbf2e7cdd8a821905398e39b4a79f5c92a57.tar.gz | |
rootfs.py: tweak inner warn message catching
The fix filters out irrelevant messages, and makes the catching more
accurate, the inner warn message in do_rootfs usually comes from the
output of complementary install, and pattern the format to catch it.
Here is the example of irrelevant messages:
...
|WARNING: log_check: There is a warn message in the logfile
|WARNING: log_check: Matched keyword: [warn]
|WARNING: log_check: `tmp/deploy/rpm/core2_64/pam-plugin-warn
-1.1.6-r5.0.core2_64.rpm' -> `tmp/work/intel_x86_64-wrs-linux/
wrlinux-image-installer/1.0-r0/rootfs/Packages.intel/./core2_64/
pam-plugin-warn-1.1.6-r5.0.core2_64.rpm'
...
(From OE-Core rev: 4ceb3b5f928af7f631294c83b83e3a3c89cbf890)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index c4735f2755..f99626ccfa 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
| @@ -348,7 +348,7 @@ class RpmRootfs(Rootfs): | |||
| 348 | pass | 348 | pass |
| 349 | 349 | ||
| 350 | def _log_check_warn(self): | 350 | def _log_check_warn(self): |
| 351 | r = re.compile('(warn|Warn)') | 351 | r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn)') |
| 352 | log_path = self.d.expand("${T}/log.do_rootfs") | 352 | log_path = self.d.expand("${T}/log.do_rootfs") |
| 353 | with open(log_path, 'r') as log: | 353 | with open(log_path, 'r') as log: |
| 354 | for line in log.read().split('\n'): | 354 | for line in log.read().split('\n'): |
