Re: [PATCH 1/5] rootfs.py: two changes regarding log checking

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2129 bytes --]

On Wed, Mar 18, 2015 at 05:16:10PM +0800, Chen Qi wrote:
> This patch involves two changes.
> 
> 1. Extend the regular expression to also catch '^WRARNING:' in _log_check_warn.

typo WRARNING

>    Warnings from bb.note or bbnote begin with 'WARNING:'. So if we decide to
>    catch warnings at rootfs time, we should not ignore those produced by
>    the build system itself.
> 
> 2. Delay _log_check in rootfs process so that more warnings are likely to be
>    catched. Note that we should at least delay the _log_check after the
>    execution of ROOTFS_POSTPROCESS_COMMANDS, because we want to catch warnings
>    there.
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  meta/lib/oe/rootfs.py | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
> index 7e8d5d1..3a77e86 100644
> --- a/meta/lib/oe/rootfs.py
> +++ b/meta/lib/oe/rootfs.py
> @@ -128,6 +128,7 @@ class Rootfs(object):
>              self._generate_kernel_module_deps()
>  
>          self._cleanup()
> +        self._log_check()
>  
>      def _uninstall_unneeded(self):
>          # Remove unneeded init script symlinks
> @@ -327,8 +328,6 @@ class RpmRootfs(Rootfs):
>  
>          self.pm.install_complementary()
>  
> -        self._log_check()
> -
>          if self.inc_rpm_image_gen == "1":
>              self.pm.backup_packaging_data()
>  
> @@ -355,7 +354,7 @@ class RpmRootfs(Rootfs):
>          pass
>  
>      def _log_check_warn(self):
> -        r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn)')
> +        r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
>          log_path = self.d.expand("${T}/log.do_rootfs")
>          with open(log_path, 'r') as log:
>              for line in log.read().split('\n'):
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]