From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66638138350 for ; Wed, 22 Apr 2020 05:53:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A8DD5E0BBE; Wed, 22 Apr 2020 05:53:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9471CE0BBE for ; Wed, 22 Apr 2020 05:53:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A12C034F0D2 for ; Wed, 22 Apr 2020 05:53:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 128BF1EE for ; Wed, 22 Apr 2020 05:52:40 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1587520335.80254c3695752a6732d2d65dfe0f9014eb746ded.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/defaults.py X-VCS-Directories: catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 80254c3695752a6732d2d65dfe0f9014eb746ded X-VCS-Branch: master Date: Wed, 22 Apr 2020 05:52:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ab3486a-300c-469c-bff0-11d1302a7d18 X-Archives-Hash: 995fd8bc69181402640eb286922476e8 commit: 80254c3695752a6732d2d65dfe0f9014eb746ded Author: Matt Turner gentoo org> AuthorDate: Wed Apr 22 00:48:18 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Apr 22 01:52:15 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=80254c36 catalyst: Remove and inline some default paths Signed-off-by: Matt Turner gentoo.org> catalyst/defaults.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index e09d08e8..a0b87f96 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -47,15 +47,6 @@ valid_config_file_values.extend([ "VERBOSE", ]) -# set our base defaults here to keep -# them in one location. -BASE_GENTOO_DIR = "/var/gentoo" -REPODIR = BASE_GENTOO_DIR + "/repos" -DISTDIR = BASE_GENTOO_DIR + "/distfiles" -PKGDIR = BASE_GENTOO_DIR + "/packages" -MAINREPO = "gentoo" -PORTDIR = REPODIR + "/" + MAINREPO - confdefaults = { "comp_prog": COMPRESSOR_PROGRAM_OPTIONS['linux'], "compression_mode": 'lbzip2', @@ -63,27 +54,27 @@ confdefaults = { "compressor_options": XATTRS_OPTIONS['linux'], "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'], "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, - "distdir": DISTDIR[:], + "distdir": "/var/cache/distfiles", "icecream": "/var/cache/icecream", 'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'], - "local_overlay": REPODIR[:] + "/local", + "local_overlay": "/var/db/repos/local", "port_conf": "/etc/portage", "make_conf": "%(port_conf)s/make.conf", "options": set(), - "pkgdir": PKGDIR[:], - "portdir": PORTDIR[:], + "pkgdir": "/var/cache/binpkgs", + "portdir": "/var/db/repos/gentoo", "port_tmpdir": "/var/tmp/portage", "PythonDir": "./catalyst", - "repo_basedir": REPODIR[:], - "repo_name": MAINREPO[:], + "repo_basedir": "/var/db/repos", + "repo_name": "gentoo", "sharedir": "/usr/share/catalyst", "shdir": "/usr/share/catalyst/targets/", "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", "snapshot_name": "%(repo_name)s-", "source_matching": "strict", "storedir": "/var/tmp/catalyst", - "target_distdir": DISTDIR[:], - "target_pkgdir": PKGDIR[:], + "target_distdir": "/var/cache/distfiles", + "target_pkgdir": "/var/cache/binpkgs", } DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf'