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 AAF0C1382C5 for ; Thu, 4 Mar 2021 10:05:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEC5BE086F; Thu, 4 Mar 2021 10:05:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D2D36E086F for ; Thu, 4 Mar 2021 10:05:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B958E340E9C for ; Thu, 4 Mar 2021 10:05:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C2F24DB for ; Thu, 4 Mar 2021 10:05:44 +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: <1614852259.4d2abfeea6574659de115aa9c81f8d7611415050.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: / X-VCS-Repository: proj/portage X-VCS-Files: setup.py X-VCS-Directories: / X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4d2abfeea6574659de115aa9c81f8d7611415050 X-VCS-Branch: master Date: Thu, 4 Mar 2021 10:05:44 +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: 7380b103-52b1-4799-8683-e985f544c860 X-Archives-Hash: a6c23a093ccb3f9db69dc06b94d9411c commit: 4d2abfeea6574659de115aa9c81f8d7611415050 Author: Zac Medico gentoo org> AuthorDate: Thu Mar 4 10:00:12 2021 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 4 10:04:19 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4d2abfee setup.py: remove unused eprefix variable Signed-off-by: Zac Medico gentoo.org> setup.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/setup.py b/setup.py index 343921525..6be01e863 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,6 @@ # Copyright 1998-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from distutils import sysconfig from distutils.core import setup, Command, Extension from distutils.command.build import build from distutils.command.build_ext import build_ext as _build_ext @@ -33,7 +32,6 @@ autodetect_pip = os.path.basename(os.environ.get("_", "")) == "pip" or os.path.b ).startswith("pip-") venv_prefix = "" if sys.prefix == sys.base_prefix else sys.prefix create_entry_points = bool(autodetect_pip or venv_prefix) -eprefix = "" with open(os.path.join(os.path.dirname(__file__), 'README'), 'rt') as f: long_description = f.read() @@ -431,14 +429,6 @@ class x_install_data(install_data): with codecs.open(path, 'w', 'utf-8') as f: f.write(data) - if create_entry_points: - # Prefix location and sync-openpgp-key-path for venv. There - # is no intention to do this for normal EPREFIX. This behavior - # is intended only when create_entry_points is True, so that - # if emerge --sync runs in a venv, the operation will not - # accidentally modify paths outside of sys.prefix. - re_sub_file('cnf/repos.conf', r'= /', '= {}/'.format(eprefix)) - self.run_command('build_man') def process_data_files(df): @@ -516,14 +506,14 @@ class x_install_lib(install_lib): "portage/const.py", ( ( - "^(PORTAGE_BASE_PATH\s*=\s*)(.*)", + r"^(PORTAGE_BASE_PATH\s*=\s*)(.*)", lambda m: "{}{}".format( m.group(1), 'os.path.realpath(os.path.join(__file__, "../../usr/lib/portage"))', ), ), ( - "^(EPREFIX\s*=\s*)(.*)", + r"^(EPREFIX\s*=\s*)(.*)", lambda m: "{}{}".format( m.group(1), 'os.path.realpath(os.path.join(__file__, "../.."))', @@ -534,9 +524,8 @@ class x_install_lib(install_lib): else: val_dict.update( { - "EPREFIX": eprefix, - "PORTAGE_BASE_PATH": eprefix + self.portage_base, - "PORTAGE_BIN_PATH": eprefix + self.portage_bindir, + "PORTAGE_BASE_PATH": self.portage_base, + "PORTAGE_BIN_PATH": self.portage_bindir, } ) rewrite_file("portage/const.py", val_dict)