[gentoo-commits] proj/catalyst:master commit in: etc/, doc/

[gentoo-commits] proj/catalyst:master commit in: etc/, doc/

[Matt Turner]

commit:     6493f3bc534f97468c514a12035b10e3107c4ecf
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 00:49:39 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=6493f3bc

catalyst: Remove some defaults from configuration file

Leave the machinery in place, but remove the default settings from the
configuration file, since basically no one is going to need to change
these and in practice they just cover up mistakes in defaults.py.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 doc/catalyst-config.5.txt | 14 +-------------
 etc/catalyst.conf         | 27 ---------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index df3f25f9..a0cd0490 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -30,19 +30,7 @@ envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache snapcache"
 
 # source repo settings
-distdir="/var/cache/distfiles"
 portdir="/var/db/repos/gentoo"
-
-# target repo info
-repo_basedir="/var/db/repos"
-repo_name="gentoo"
-target_distdir="/var/cache/distfiles"
-target_pkgdir="/var/cache/binpkgs"
-
-# other catalyst settings
-sharedir="/usr/share/catalyst"
-snapshot_cache="/var/tmp/catalyst/snapshot_cache"
-storedir="/var/tmp/catalyst"
 ---------------------------------
 
 The possible keywords and their meanings are as follows:
@@ -150,7 +138,7 @@ The default location is `/var/cache/distfiles`.
 *target_pkgdir*::
 This is the target packages directory for storing binpkgs in the stage being
 built.  This location is stored in the make.conf of the stage being built.
-The default location for this has typically been `/var/cache/binpkgs`
+The default location is `/var/cache/binpkgs`
 
 Other settings
 ~~~~~~~~~~~~~~

diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 60a4dd93..6d530a39 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -58,33 +58,6 @@ options="autoresume bindist kerncache pkgcache seedcache snapcache"
 # Source portdir specifies the source portage tree used by the snapshot target.
 portdir="/var/db/repos/gentoo"
 
-# Target portdir setting.  It needs to be in 2 parts.
-# They will be used separately, then added together where needed.
-# eg:
-# repo_basedir="/var/db/repos"
-# repo_name="gentoo"
-#
-repo_basedir="/var/db/repos"
-repo_name="gentoo"
-target_distdir="/var/cache/distfiles"
-target_pkgdir="/var/cache/binpkgs"
-
-# sharedir specifies where all of the catalyst runtime executables
-# and other shared lib objects are.
-# Most users do not need to change this.
-sharedir="/usr/share/catalyst"
-
-# shdir specifies where all of the catalyst runtime executables are.
-shdir="%(sharedir)s/targets"
-
-# snapshot_cache specifies where the snapshots will be cached to if snapcache is
-# enabled in the options.
-snapshot_cache="/var/tmp/catalyst/snapshot_cache"
-
-# storedir specifies where catalyst will store everything that it builds, and
-# also where it will put its temporary files and caches.
-storedir="/var/tmp/catalyst"
-
 # source_matching specifies how catalyst will match non-specific file names
 # if the filename is not found as an exact match.
 # ie: a filename without the extension specified.  "/path/to/foo"