| 1 |
commit: f40238e0c5644db5dcaaab9f0305cc9d62b144a1 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 18 22:52:36 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 20 01:49:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f40238e0 |
| 7 |
|
| 8 |
catalyst: Remove PythonDir setting |
| 9 |
|
| 10 |
Was used to find the arch directory containing, e.g., sparc.py, but all |
| 11 |
that code is gone now after the modules were converted to TOML. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
catalyst/defaults.py | 1 - |
| 16 |
catalyst/main.py | 3 --- |
| 17 |
2 files changed, 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 20 |
index 404f4892..f6bc1e14 100644 |
| 21 |
--- a/catalyst/defaults.py |
| 22 |
+++ b/catalyst/defaults.py |
| 23 |
@@ -64,7 +64,6 @@ confdefaults = { |
| 24 |
"options": set(), |
| 25 |
"pkgdir": "/var/cache/binpkgs", |
| 26 |
"port_tmpdir": "/var/tmp/portage", |
| 27 |
- "PythonDir": "./catalyst", |
| 28 |
"repo_basedir": "/var/db/repos", |
| 29 |
"repo_name": "gentoo", |
| 30 |
"repos": "%(storedir)s/repos", |
| 31 |
|
| 32 |
diff --git a/catalyst/main.py b/catalyst/main.py |
| 33 |
index bad712fa..b01d7a6a 100644 |
| 34 |
--- a/catalyst/main.py |
| 35 |
+++ b/catalyst/main.py |
| 36 |
@@ -55,9 +55,6 @@ def parse_config(config_files): |
| 37 |
else: |
| 38 |
conf_values[x] = confdefaults[x] |
| 39 |
|
| 40 |
- # add our python base directory to use for loading target arch's |
| 41 |
- conf_values["PythonDir"] = os.path.dirname(os.path.realpath(__file__)) |
| 42 |
- |
| 43 |
# print out any options messages |
| 44 |
for opt in conf_values['options']: |
| 45 |
if opt in option_messages: |
Archives