[OE-core] [PATCH] rootfs.py: Improve rpm log_check_regex
Ed Bartosh
ed.bartosh at linux.intel.com
Wed May 20 10:40:18 UTC 2015
Current regex can cause false negatives if paths in bitbake log files
contain "ERR" or "Fail". do_rootfs fails with return code 1 in
this case.
Improved regexp is based on error messages produced by rpm.
Those are found by analyzing rpm source code.
[YOCTO #7789]
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
meta/lib/oe/rootfs.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 6fb749f..ce23b23 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -295,7 +295,9 @@ class Rootfs(object):
class RpmRootfs(Rootfs):
def __init__(self, d, manifest_dir):
super(RpmRootfs, self).__init__(d)
- self.log_check_regex = '(unpacking of archive failed|Cannot find package|exit 1|ERR|Fail)'
+ self.log_check_regex = '(unpacking of archive failed|Cannot find package'\
+ '|exit 1|ERROR: |Error: |Error |ERROR '\
+ '|Failed |Failed: |Failed$|Failed\(\d+\):)'
self.manifest = RpmManifest(d, manifest_dir)
self.pm = RpmPM(d,
--
2.1.4
More information about the Openembedded-core
mailing list