Re: [PATCH 2/7] wic: Remove obsolete reference to msger logger

[Jan Kiszka <jan.kiszka@siemens.com>]

On 26.11.18 10:45, Henning Schild wrote:
> Is this a cherry pick of a single commit on wic? If so i am stronly
> against that. Bump the whole thing but do not fork it.
> 

What is the baseline then? Where can we move to, i.e. what were you selection 
criteria back then?

Jan

> Henning
> 
> Am Mon, 26 Nov 2018 10:38:57 +0100
> schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> OE core commit b561292c4e7b.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   scripts/lib/wic/plugins/source/rootfs.py | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/lib/wic/plugins/source/rootfs.py
>> b/scripts/lib/wic/plugins/source/rootfs.py index f2e2ca8..944ec5f
>> 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py
>> +++ b/scripts/lib/wic/plugins/source/rootfs.py
>> @@ -28,6 +28,7 @@
>>   import logging
>>   import os
>>   import shutil
>> +import sys
>>   
>>   from oe.path import copyhardlinktree
>>   
>> @@ -98,7 +99,8 @@ class RootfsPlugin(SourcePlugin):
>>               for orig_path in part.exclude_path:
>>                   path = orig_path
>>                   if os.path.isabs(path):
>> -                    msger.error("Must be relative:
>> --exclude-path=%s" % orig_path)
>> +                    logger.error("Must be relative:
>> --exclude-path=%s" % orig_path)
>> +                    sys.exit(1)
>>   
>>                   full_path =
>> os.path.realpath(os.path.join(new_rootfs, path))
>> @@ -106,7 +108,8 @@ class RootfsPlugin(SourcePlugin):
>>                   # because doing so could be quite disastrous (we
>> will delete the # directory).
>>                   if not full_path.startswith(new_rootfs):
>> -                    msger.error("'%s' points to a path outside the
>> rootfs" % orig_path)
>> +                    logger.error("'%s' points to a path outside the
>> rootfs" % orig_path)
>> +                    sys.exit(1)
>>   
>>                   if path.endswith(os.sep):
>>                       # Delete content only.
> 


-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux