public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Ben Kohler <bkohler@gmail.com>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] Subject: [PATCH 1/2] stagebase.py: strip leading slash from /etc/portage in pjoin
Date: Thu, 28 Dec 2017 14:33:06 -0600	[thread overview]
Message-ID: <CANSUr=KaVcg5iKVfO7T66SN_VaKimxKEX5iqh1=sqOzFDSLKGA@mail.gmail.com> (raw)

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

~


                 reply	other threads:[~2017-12-28 20:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CANSUr=KaVcg5iKVfO7T66SN_VaKimxKEX5iqh1=sqOzFDSLKGA@mail.gmail.com' \
    --to=bkohler@gmail.com \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox