commit: 7904c59e78590a1fd0a07a9a439fb5c4e9865425
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 01:15:59 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 02:09:59 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7904c59e
catalyst: Make distdir default to host's DISTDIR
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/defaults.py | 4 +++-
doc/catalyst-config.5.txt | 5 ++---
etc/catalyst.conf | 4 ----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index a0b87f96..0c18f9f5 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -1,4 +1,6 @@
+import portage
+
from collections import OrderedDict
from DeComp.definitions import DECOMPRESSOR_SEARCH_ORDER
@@ -54,7 +56,7 @@ confdefaults = {
"compressor_options": XATTRS_OPTIONS['linux'],
"decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'],
"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
- "distdir": "/var/cache/distfiles",
+ "distdir": portage.settings['DISTDIR'],
"icecream": "/var/cache/icecream",
'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'],
"local_overlay": "/var/db/repos/local",
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 14b7dd5a..df3f25f9 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -122,9 +122,8 @@ Repository settings
~~~~~~~~~~~~~~~~~~~
*distdir*::
-Source distfiles location used in generation of the stages. This is usually
the
-hosts distfiles location. `/var/cache/distfiles` should work for most
-default installations, but it should be set to match your hosts configuration.
+Defines the location of your local source file repository.
+Defaults to the host's DISTDIR.
*portdir*::
Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should
work for most
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 2e511cce..60a4dd93 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -12,10 +12,6 @@
#
digests="blake2b sha512"
-# distdir specifies where your distfiles are located. This setting should
-# work fine for most default installations.
-distdir="/var/cache/distfiles"
-
# envscript allows users to set options such as http proxies, MAKEOPTS,
# GENTOO_MIRRORS, or any other environment variables needed for building.
# The envscript file sets environment variables like so:
