From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6628101524125908992 X-Received: by 2002:adf:df83:: with SMTP id z3mr2673144wrl.21.1543225144318; Mon, 26 Nov 2018 01:39:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:138b:: with SMTP id 133ls2269539wmt.6.gmail; Mon, 26 Nov 2018 01:39:03 -0800 (PST) X-Google-Smtp-Source: AJdET5dfddEBgyNarNxO7Un7d/Jpe68nXT6uy5BHQApajviNCq3+XpkeQOBGwV3K+N6Z1V9Uenk5 X-Received: by 2002:a7b:c0cd:: with SMTP id s13mr2994094wmh.15.1543225143727; Mon, 26 Nov 2018 01:39:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543225143; cv=none; d=google.com; s=arc-20160816; b=nKMuhChN9qvtLnQelWfXjAi7p/4X3Ql7weBXeeEd2sVaDFi+/ExlAP/59TqfDFj60A KRpV/qskuSn5t+byO47Ps3CXJCWqj12+/6l3BHia1BR1gOsz1P2L+ZaXYSm7dUK84u/p C0l1MxUIoaLsRe2YjTow9W8iE1Ok8kRcELU3frLdt/jc1ffyq8DgpFbxFRt39qku2dv5 YJ6lBrdp/GcmKhODLO0aJ7MvpjWOojdJv42x70ECCPptM2MNQgEGZM5/DUsM7vPQqyQn /Hd3stjwc0RrODAuaAyok8S4eBRAsCUlfikm3fXndq+gNQZx3hOT/5N1k7zsVmzqcmtb d4ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from; bh=C42ItOdWXCk7Ga3Ho8ULbm++okX6NA8hs0m8DCbf558=; b=zrnD8K1YsfcSP5DBbeObHaWPgEuuN1XpRP3z92oobtyUKYhg1mPIHxqRNOmQqgeBjz qByUXvXYBaqmz1EJvTAkrq653E74k2M+KUzZg5/uEYQ9G4prZtdVFZSEfn6VPJJPzH9H 5MGzu5yUUjv7YjjBD4kF9L6CWlfSV01r0rtUmvfm7MrIH5Gukp1HIQndfnPm068Aa26H v8JN6IC+4A/rM3LHPfpKLOk7b7yxy71mHE0mpf8cXbOQ16z4z1KtM0puWf9P+P3wvnAd pBZAVxa3m1H/kDXWjy97WJdOHsFDUVv4ZvWyDs+vWmCOXGKThZcRTzG9mghhORbGd9af MUmQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f136si9409wmd.1.2018.11.26.01.39.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 01:39:03 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id wAQ9d3SZ030176 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Nov 2018 10:39:03 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.23.79.230]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id wAQ9d2uu012310; Mon, 26 Nov 2018 10:39:03 +0100 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 2/7] wic: Remove obsolete reference to msger logger Date: Mon, 26 Nov 2018 10:38:57 +0100 Message-Id: <3486bd6a6beda4e294fe9c03e6901f00d9093b7e.1543225142.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: PEDIBlPxVd51 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. -- 2.16.4