[gnome-continuous-yocto/gnomeostree-3.28-rocko: 404/8267] rootfs.py: Simplify the regular expression used in _log_check_warn()



commit a653f36814fca438db834509f99ad37e74719d45
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Thu May 19 00:28:14 2016 +0200

    rootfs.py: Simplify the regular expression used in _log_check_warn()
    
    In commit 0387d095 lines with "NOTE:" in them were excluded from the
    log check for warnings. However, those lines were only there in the
    first place since the regular expression that is used to find warning
    messages explicitly included those lines...
    
    (From OE-Core rev: 865ab39f18a52ed84217df56d0e65113e2894d02)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/rootfs.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 0a2753e..a92aa22 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -41,11 +41,11 @@ class Rootfs(object):
         pass
 
     def _log_check_warn(self):
-        r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
+        r = re.compile('^(warn|Warn|WARNING:)')
         log_path = self.d.expand("${T}/log.do_rootfs")
         with open(log_path, 'r') as log:
             for line in log:
-                if 'log_check' in line or 'NOTE:' in line:
+                if 'log_check' in line:
                     continue
 
                 m = r.search(line)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]