From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628101524125908992 X-Received: by 2002:a17:906:3582:: with SMTP id o2-v6mr3823558ejb.13.1543225858862; Mon, 26 Nov 2018 01:50:58 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:a5f8:: with SMTP id b53ls5714630edc.5.gmail; Mon, 26 Nov 2018 01:50:58 -0800 (PST) X-Google-Smtp-Source: AFSGD/Weo4184tZ85wfEoviIAa1UurukRfG1Gabo7QZwF1I4YOsG1c1jMeBesVIDAFSpA1y2dfuF X-Received: by 2002:a50:d1d6:: with SMTP id i22mr4746339edg.1.1543225858364; Mon, 26 Nov 2018 01:50:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543225858; cv=none; d=google.com; s=arc-20160816; b=ecLq5Xv+aB2siNlL/OyYdUP4V+Dq8CdblG0Hwxw2ArshSZXH5MOvjfhVQ0KttLHKUh tawy/QZSG4tKE2Alwm3OzfUEyvnKnNzoCjsYWb4aSJXwAfy7xMA+kmpClq9OIx2LSLl/ agYtGfhrkbqYZyhlMuFjzRwI4eo7MY4BAUJs7F83InZshlOENpYHjp0eNzRHzqSCXIgw Xa3fMUrFQXXyCUAjhK4zP3tLwxzo5q1aLdJFkysIoQnY/C9aEcw2yZWvAIYUOHaSa3yw Q2vyWRT6srDztL8UsJ7Lm6ZJNeK7pIDLARVLLZKGFXlAZr4dXKS1QNz7nHkQGsMZWcf+ G4yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=b0/YSK4fJKt31WrhOpcsYy1FZQz0R+LX+9mrd/2+CL4=; b=jdyT6HxMLamEgvuz9ynQkgq/gGUxT/bAMs9p77RJkjTHNQRoTJJtcUJmUkwgG6kd7m 0Zmssg3cgapQ4BKH+CdNU4xzU++HWmrWUzEEkCnmkQbMWJqz7u1nCr09xyZ374b0AIjT saf/kCSut3xKaGRmj0LJBPFBgB0GEyFLxShZzpyD7NDF7DD7SwxfA3kshGRD988CzaAk YirDmKk0nqXn8oLfjtTIyJ8vViBWLThgYPw2HJ1xDJRhN7goaOo16vPsdJFlayz1uam1 Oe855YNszMHi2s4ZajxDjPPKv6hYTdwUJXYsdyJzZSAlE7mRKn+f7/RLmma1JO8J5/9a zWUg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id k13si14128edx.2.2018.11.26.01.50.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 01:50:58 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id wAQ9ov9g010272 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Nov 2018 10:50:57 +0100 Received: from [139.23.79.230] ([139.23.79.230]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id wAQ9ovnQ012091; Mon, 26 Nov 2018 10:50:57 +0100 Subject: Re: [PATCH 2/7] wic: Remove obsolete reference to msger logger To: Henning Schild Cc: isar-users References: <3486bd6a6beda4e294fe9c03e6901f00d9093b7e.1543225142.git.jan.kiszka@siemens.com> <20181126104521.3b4c27a9@md1za8fc.ad001.siemens.net> From: Jan Kiszka Message-ID: Date: Mon, 26 Nov 2018 10:50:57 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <20181126104521.3b4c27a9@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 0DkSqloZ1WqP 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 : > >> From: Jan Kiszka >> >> OE core commit b561292c4e7b. >> >> Signed-off-by: Jan Kiszka >> --- >> 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