summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-05-20 13:40:18 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:44:09 +0100
commita9ddd71880c65d5492f1a058218e2a0bbe0b741b (patch)
tree7646d4b62d8d393e180e0b261c5243df289e6898
parent53f761d05ee22c6139d3ff77fa2ce85bf9723b76 (diff)
downloadpoky-a9ddd71880c65d5492f1a058218e2a0bbe0b741b.tar.gz
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] (From OE-Core rev: 38871dc0295fb2516e1c8b1dc9948c2d2fc4d2cd) (From OE-Core rev: 4a7f15e1d64a5d4ca4cd9b46a0ee5903e441b4e0) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py4
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):
295class RpmRootfs(Rootfs): 295class RpmRootfs(Rootfs):
296 def __init__(self, d, manifest_dir): 296 def __init__(self, d, manifest_dir):
297 super(RpmRootfs, self).__init__(d) 297 super(RpmRootfs, self).__init__(d)
298 self.log_check_regex = '(unpacking of archive failed|Cannot find package|exit 1|ERR|Fail)' 298 self.log_check_regex = '(unpacking of archive failed|Cannot find package'\
299 '|exit 1|ERROR: |Error: |Error |ERROR '\
300 '|Failed |Failed: |Failed$|Failed\(\d+\):)'
299 self.manifest = RpmManifest(d, manifest_dir) 301 self.manifest = RpmManifest(d, manifest_dir)
300 302
301 self.pm = RpmPM(d, 303 self.pm = RpmPM(d,