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 D576C158011 for ; Mon, 20 Sep 2021 20:07:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7A8DE0827; Mon, 20 Sep 2021 20:07:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD1A2E0827 for ; Mon, 20 Sep 2021 20:07:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE125342FF9 for ; Mon, 20 Sep 2021 20:07:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12852D0 for ; Mon, 20 Sep 2021 20:06:59 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1632168349.016d5a48d230123f662f3da4ae7d900d365582aa.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/const.py X-VCS-Directories: lib/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 016d5a48d230123f662f3da4ae7d900d365582aa X-VCS-Branch: master Date: Mon, 20 Sep 2021 20:06:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7c02002f-436c-450e-8565-9552137a410b X-Archives-Hash: de4417c7e4e0a41ab20eaf33ab91fbbf commit: 016d5a48d230123f662f3da4ae7d900d365582aa Author: Wolfgang E. Sanyer gmail com> AuthorDate: Mon Sep 20 18:11:07 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 20 20:05:49 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=016d5a48 Fix installation issue related to black formatting and regex Bug: https://bugs.gentoo.org/814113 Closes: https://github.com/gentoo/portage/pull/749 Signed-off-by: Wolfgang E. Sanyer gmail.com> Signed-off-by: Zac Medico gentoo.org> lib/portage/const.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/portage/const.py b/lib/portage/const.py index e46f47892..abe0ef6c6 100644 --- a/lib/portage/const.py +++ b/lib/portage/const.py @@ -60,7 +60,9 @@ GLOBAL_CONFIG_PATH = "/usr/share/portage/config" # NOTE: Use realpath(__file__) so that python module symlinks in site-packages # are followed back to the real location of the whole portage installation. # NOTE: Please keep PORTAGE_BASE_PATH in one line to help substitutions. +# fmt:off PORTAGE_BASE_PATH = os.path.join(os.sep, os.sep.join(os.path.realpath(__file__.rstrip("co")).split(os.sep)[:-3])) +# fmt:on PORTAGE_BIN_PATH = PORTAGE_BASE_PATH + "/bin" PORTAGE_PYM_PATH = os.path.realpath(os.path.join(__file__, "../..")) LOCALE_DATA_PATH = PORTAGE_BASE_PATH + "/locale" # FIXME: not used