From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/
Date: Thu, 3 May 2018 23:22:42 +0000 (UTC) [thread overview]
Message-ID: <1525388927.b69a756099973abbf9719717ea3726519b32ce60.zmedico@gentoo> (raw)
commit: b69a756099973abbf9719717ea3726519b32ce60
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu May 3 23:00:35 2018 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu May 3 23:08:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b69a7560
LocationsManager: fix SYSROOT normalization to handle empty SYSROOT
This issue was exposed when building portage-2.3.34 with USE="epydoc"
enabled, since epydoc triggers instantiation of portage.settings.
The empty SYSROOT change for bug 654600 (in commit
1b5110557d1dd725f7c12bbed4b7ceaaec29f2a3) triggered incorrect
normalization behavior here.
Fixes: a41dacf7926c ("Export SYSROOT and ESYSROOT in ebuild env in EAPI 7")
pym/portage/package/ebuild/_config/LocationsManager.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py
index b57443ba7..f7d7209ff 100644
--- a/pym/portage/package/ebuild/_config/LocationsManager.py
+++ b/pym/portage/package/ebuild/_config/LocationsManager.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
from __future__ import unicode_literals
@@ -69,7 +69,7 @@ class LocationsManager(object):
if self.sysroot is None:
self.sysroot = "/"
else:
- self.sysroot = normalize_path(os.path.abspath(self.sysroot)).rstrip(os.sep) + os.sep
+ self.sysroot = normalize_path(os.path.abspath(self.sysroot or os.sep)).rstrip(os.sep) + os.sep
self.esysroot = self.sysroot.rstrip(os.sep) + self.eprefix + os.sep
next reply other threads:[~2018-05-03 23:22 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-03 23:22 Zac Medico [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-03 20:34 [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/_config/ Zac Medico
2017-09-02 17:08 Zac Medico
2017-09-02 9:01 Zac Medico
2017-08-05 20:22 Zac Medico
2015-11-30 23:28 Arfrever Frehtes Taifersar Arahesis
2014-12-13 6:35 Arfrever Frehtes Taifersar Arahesis
2014-11-02 17:54 Zac Medico
2014-10-24 20:39 Zac Medico
2013-10-26 19:31 Arfrever Frehtes Taifersar Arahesis
2013-07-30 5:30 Zac Medico
2013-06-07 20:39 Arfrever Frehtes Taifersar Arahesis
2013-03-12 0:40 Mike Frysinger
2013-01-20 1:30 Zac Medico
2013-01-20 1:28 Zac Medico
2013-01-20 0:44 Zac Medico
2013-01-20 0:12 Zac Medico
2013-01-15 15:03 Zac Medico
2012-10-18 1:03 Zac Medico
2012-09-21 4:31 Arfrever Frehtes Taifersar Arahesis
2012-09-07 20:52 Zac Medico
2012-09-07 0:48 Arfrever Frehtes Taifersar Arahesis
2012-09-06 21:46 Arfrever Frehtes Taifersar Arahesis
2012-08-29 15:51 Zac Medico
2012-08-25 20:40 Zac Medico
2012-04-25 16:41 Zac Medico
2012-04-25 16:38 Zac Medico
2011-12-18 20:15 Zac Medico
2011-10-30 7:16 Zac Medico
2011-10-28 4:55 Zac Medico
2011-10-28 2:48 Zac Medico
2011-10-28 1:45 Zac Medico
2011-10-27 18:49 Zac Medico
2011-10-27 17:24 Zac Medico
2011-10-10 1:41 Zac Medico
2011-10-09 19:10 Zac Medico
2011-10-08 21:41 Arfrever Frehtes Taifersar Arahesis
2011-10-02 2:14 Zac Medico
2011-08-13 12:25 Zac Medico
2011-07-13 17:26 Zac Medico
2011-06-21 1:31 Zac Medico
2011-04-04 22:03 Zac Medico
2011-03-26 1:45 Zac Medico
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=1525388927.b69a756099973abbf9719717ea3726519b32ce60.zmedico@gentoo \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@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