Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 04/21] catalyst: Remove PythonDir setting
Date: Wed, 20 May 2020 03:42:44
Message-Id: 20200520034226.2870937-4-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/21] targets: Remove copy_{file,symlink,lib} functions by Matt Turner
1 Was used to find the arch directory containing, e.g., sparc.py, but all
2 that code is gone now after the modules were converted to TOML.
3
4 Signed-off-by: Matt Turner <mattst88@g.o>
5 ---
6 catalyst/defaults.py | 1 -
7 catalyst/main.py | 3 ---
8 2 files changed, 4 deletions(-)
9
10 diff --git a/catalyst/defaults.py b/catalyst/defaults.py
11 index 404f4892..f6bc1e14 100644
12 --- a/catalyst/defaults.py
13 +++ b/catalyst/defaults.py
14 @@ -64,7 +64,6 @@ confdefaults = {
15 "options": set(),
16 "pkgdir": "/var/cache/binpkgs",
17 "port_tmpdir": "/var/tmp/portage",
18 - "PythonDir": "./catalyst",
19 "repo_basedir": "/var/db/repos",
20 "repo_name": "gentoo",
21 "repos": "%(storedir)s/repos",
22 diff --git a/catalyst/main.py b/catalyst/main.py
23 index bad712fa..b01d7a6a 100644
24 --- a/catalyst/main.py
25 +++ b/catalyst/main.py
26 @@ -55,9 +55,6 @@ def parse_config(config_files):
27 else:
28 conf_values[x] = confdefaults[x]
29
30 - # add our python base directory to use for loading target arch's
31 - conf_values["PythonDir"] = os.path.dirname(os.path.realpath(__file__))
32 -
33 # print out any options messages
34 for opt in conf_values['options']:
35 if opt in option_messages:
36 --
37 2.26.2