[gentoo-commits] proj/catalyst:pending commit in: catalyst/

[Brian Dolbec]

commit:     d56584f32de50a1b2840bafb712656011d5ee2b3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 09:24:22 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 09:35:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d56584f3

defaults.py: Update all repository, DISTDIR, PKGDIR settings to new /var paths

All settings are still configurable in catalyst.conf.
These are new reasonable settings for a relocated tree system.
A user can still set their own locations during install, or at a later time.

Default catalyst.conf settings will be changed at a later time after additional 
testing and
the automatic stage building scripts have been updated.

 catalyst/defaults.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 84ed282..947e236 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -39,24 +39,24 @@ confdefaults={
        "compressor_options": XATTRS_OPTIONS[TAR],
        "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS[TAR],
        "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
-       "distdir": "/usr/portage/distfiles",
+       "distdir": "/var/portage/distfiles",
        "hash_function": "crc32",
        "icecream": "/var/cache/icecream",
        'list_xattrs_opt': LIST_XATTRS_OPTIONS[TAR],
-       "local_overlay": "/usr/local/portage",
+       "local_overlay": "/var/portage/repos/local",
        "port_conf": "/etc/portage",
        "make_conf": "%(port_conf)s/make.conf",
        "options": set(),
-       "packagedir": "/usr/portage/packages",
-       "portdir": "/usr/portage",
+       "packagedir": "/var/portage/packages",
+       "portdir": "/var/portage/repos",
        "port_tmpdir": "/var/tmp/portage",
        "PythonDir": "./catalyst",
-       "repo_basedir": "/usr",
-       "repo_name": "portage",
+       "repo_basedir": "/var/portage/repos",
+       "repo_name": "gentoo",
        "sharedir": "/usr/share/catalyst",
        "shdir": "/usr/share/catalyst/targets/",
        "snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
-       "snapshot_name": "portage-",
+       "snapshot_name": "%(repo_name)s-",
        "source_matching": "strict",
        "storedir": "/var/tmp/catalyst",
        "target_distdir": "/var/portage/distfiles",
@@ -75,8 +75,8 @@ TARGET_MOUNT_DEFAULTS = {
        "distdir": "/usr/portage/distfiles",
        "icecream": "/usr/lib/icecc/bin",
        "kerncache": "/tmp/kerncache",
-       "packagedir": "/usr/portage/packages",
-       "portdir": "/usr/portage",
+       "packagedir": "/var/portage/packages",
+       "portdir": "/var/portage/repos",
        "port_tmpdir": "/var/tmp/portage",
        "port_logdir": "/var/log/portage",
        "proc": "/proc",
@@ -86,8 +86,8 @@ TARGET_MOUNT_DEFAULTS = {
 SOURCE_MOUNT_DEFAULTS = {
        "dev": "/dev",
        "devpts": "/dev/pts",
-       "distdir": "/usr/portage/distfiles",
-       "portdir": "/usr/portage",
+       "distdir": "/var/portage/distfiles",
+       "portdir": "/var/portage/repos",
        "port_tmpdir": "tmpfs",
        "proc": "/proc",
        "shm": "shmfs",