From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58AAA138AE9 for ; Thu, 28 Dec 2017 20:33:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74B72E0E94; Thu, 28 Dec 2017 20:33:09 +0000 (UTC) Received: from mail-wr0-x22d.google.com (mail-wr0-x22d.google.com [IPv6:2a00:1450:400c:c0c::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21B80E0E94 for ; Thu, 28 Dec 2017 20:33:09 +0000 (UTC) Received: by mail-wr0-x22d.google.com with SMTP id 36so6870314wrh.1 for ; Thu, 28 Dec 2017 12:33:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=TPndRXitjOCGOXzvs6hG7qJWnn8RchSQJ3x1WHwUdWc=; b=kzKz1Pm5iSF6NQ30QPc4Pd0r2jcTqP26SVdOmXZxq7FPKzlxATe5cHoXNmVIMTMlGG 4fRKnruRD2DyCcFjr/mJT2JTiN/Bm8E9Z84SDdWmaRazdFm6WWRksVzC+mNGQcZwaVzE wLogYJObGnss8GriMBr6h0pos8mIJwMniYIilPCO0BWk/JcJYNBMyRAFxoWUTQ2kuBc9 yaUnqeh3WaymlpuAi6LGLuc0gpLFn4A36ew1j/9WMpgYAYq4ajeeb+se+OKUpND5KtXC Z2qqLX9Wwy0dzwRw7mkfVM5RHQT3UPSBFTOTpafZyZHkFaYP4yYTGd7G8MOtxg3daC4J Uplg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=TPndRXitjOCGOXzvs6hG7qJWnn8RchSQJ3x1WHwUdWc=; b=rxND1IL+v/VwqWqpQeKdwkV5RLqau79PSY5zUFKjTYEC9Ka8ABOaTi8PCpYvkgLQlm D+NorEa43AlUObJjknhqmb1MmNAvoi3O4QO+qJgKHYn333EeINiSPjKfi9KjWAme/Hq4 OpE52ksZl15KnJaCkpFav4W5SPeTfkQntmR6ZAyyU3uHAURYtZ+lZSNIVHGqLECTlK8N 3uOTfn212bMWw/o9VhWdR6ZzNQEXZsk9mPqgcXmpR08S2RBn9u5LRfqLfoZJtxYa8LLp 8UY1NzOtiIl4+oRFA09CUReJfzSyO1V8NgozMSWyFk7PRh0DAyUUyob3viNdp/IIutca O7ZQ== X-Gm-Message-State: AKGB3mK1XedXsbEJuuQED3Sp8A+RslWDkLyDX2ABuq4FG1QTx5/XM03e Kv+O2cVbTjxceUal/AdanErgcP3rt7oa+Bob2EKsFw== X-Google-Smtp-Source: ACJfBovBythqw1kg5qFx7iuUpf+RQbym7L/68zgqdu6no+aYXRvUxzII2eShCfO4qSjIWaBJA44xtlkqSNOhIluR4vk= X-Received: by 10.223.184.92 with SMTP id u28mr33985555wrf.61.1514493187513; Thu, 28 Dec 2017 12:33:07 -0800 (PST) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Received: by 10.28.142.2 with HTTP; Thu, 28 Dec 2017 12:33:06 -0800 (PST) From: Ben Kohler Date: Thu, 28 Dec 2017 14:33:06 -0600 Message-ID: Subject: [gentoo-catalyst] Subject: [PATCH 1/2] stagebase.py: strip leading slash from /etc/portage in pjoin To: gentoo-catalyst@lists.gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: a02213ce-5699-41be-b4db-cf8a6368deb4 X-Archives-Hash: 2a1bffa4679dc658de9173072564c4ea Only the first component passed to pjoin can have a leading slash, otherwise the component will be treated as an absolute path and all preceding components are discarded. --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a6a32f5a..999bf8df 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1219,7 +1219,7 @@ class StageBase(TargetBase, ClearBase, GenBase): "sticky-config" not in self.settings["options"]): for _dir in "keywords", "mask", "unmask", "use": target = pjoin([self.settings['chroot_path'], - "/etc/portage/package.%s" % _dir, + "etc/portage/package.%s" % _dir, self.settings["portage_prefix"]]) clear_path(target) -- 2.13.6 ~