[oe-commits] Ed Bartosh : rootfs.py: Improve rpm log_check_regex

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd

Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date:   Wed May 20 13:40:18 2015 +0300

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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at 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,