Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/
Date: Mon, 20 Sep 2021 20:07:03
Message-Id: 1632168349.016d5a48d230123f662f3da4ae7d900d365582aa.zmedico@gentoo
1 commit: 016d5a48d230123f662f3da4ae7d900d365582aa
2 Author: Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail <DOT> com>
3 AuthorDate: Mon Sep 20 18:11:07 2021 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 20 20:05:49 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=016d5a48
7
8 Fix installation issue related to black formatting and regex
9
10 Bug: https://bugs.gentoo.org/814113
11 Closes: https://github.com/gentoo/portage/pull/749
12 Signed-off-by: Wolfgang E. Sanyer <WolfgangESanyer <AT> gmail.com>
13 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
14
15 lib/portage/const.py | 2 ++
16 1 file changed, 2 insertions(+)
17
18 diff --git a/lib/portage/const.py b/lib/portage/const.py
19 index e46f47892..abe0ef6c6 100644
20 --- a/lib/portage/const.py
21 +++ b/lib/portage/const.py
22 @@ -60,7 +60,9 @@ GLOBAL_CONFIG_PATH = "/usr/share/portage/config"
23 # NOTE: Use realpath(__file__) so that python module symlinks in site-packages
24 # are followed back to the real location of the whole portage installation.
25 # NOTE: Please keep PORTAGE_BASE_PATH in one line to help substitutions.
26 +# fmt:off
27 PORTAGE_BASE_PATH = os.path.join(os.sep, os.sep.join(os.path.realpath(__file__.rstrip("co")).split(os.sep)[:-3]))
28 +# fmt:on
29 PORTAGE_BIN_PATH = PORTAGE_BASE_PATH + "/bin"
30 PORTAGE_PYM_PATH = os.path.realpath(os.path.join(__file__, "../.."))
31 LOCALE_DATA_PATH = PORTAGE_BASE_PATH + "/locale" # FIXME: not used