diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-05-20 13:40:18 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-21 10:48:47 +0100 |
| commit | 38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd (patch) | |
| tree | 18d7949ef7862d213e95e7dd067ffbd0c3251676 | |
| parent | ada8972ec40441b06e50d3e9ccbc07241a48e30a (diff) | |
| download | openembedded-core-38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd.tar.gz openembedded-core-38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd.tar.bz2 openembedded-core-38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd.zip | |
rootfs.py: Improve rpm log_check_regex
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@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/lib/oe/rootfs.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 6fb749f049..ce23b237dc 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, |