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 48AED1382C5 for ; Wed, 20 May 2020 03:43:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D8E2E08DC; Wed, 20 May 2020 03:43:02 +0000 (UTC) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 8466DE08DC for ; Wed, 20 May 2020 03:43:02 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id a5so624629pjh.2 for ; Tue, 19 May 2020 20:43:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sowkMJi7uJQy/XUyoJ86r1UjdzoSpiIrpLHooOmsJyE=; b=HsGb5NK3QKLIOGc2BlV7zEcN2hcVdg2Uq6DIJ5Ejt8WsWTs4VamWEk+3ngXjnob3Ch cJXHh6JLIKUAid0O4j8WHG9vYA5zFfnMjEFOvqdffahaYuhwpjhW6o5DaHiB2bevQ4Fx UqfuSUIqu97Y8JEp8L2FrIpWTXIrgu3ubee7QM6w1KUEK4wpJEq9PL/KqsYmiE95H3S2 7k2B0nXUCDxqHl++zpFrPL/DyaVmdUel5GiIX6QbDd4mq1UHwOuWTS0Zsdi2GL/BZxyX 5q7DujLAxC+A4P1cX9/rqMqEPejRuvfVfzK/Hwu4fNT8s3doojrp6der6FVSXWGt93Tp 97Ew== X-Gm-Message-State: AOAM5308ArGivBCuU6Dj3boRWng7TtFvHd/DLR+mwf/UjdhJphuhni5r ubBPjAxrHeZfVYMumVe0tNVafe6y X-Google-Smtp-Source: ABdhPJz6E+TKR3Hf24NRHz6e72mu5fSqzWQBMieIwUfvecz3FZsv1kmLvKp3wrwC2RPDQtLRKLbxPQ== X-Received: by 2002:a17:90a:1b6c:: with SMTP id q99mr2948602pjq.214.1589946181197; Tue, 19 May 2020 20:43:01 -0700 (PDT) Received: from localhost ([134.134.137.77]) by smtp.gmail.com with ESMTPSA id c2sm661779pgj.93.2020.05.19.20.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 20:43:00 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 11/21] catalyst: Add a missing options to valid_config_file_values Date: Tue, 19 May 2020 20:42:16 -0700 Message-Id: <20200520034226.2870937-11-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520034226.2870937-1-mattst88@gentoo.org> References: <20200520034226.2870937-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: e455dd4c-0c8e-49c9-bf73-b2ea159c4798 X-Archives-Hash: 140fc76726147a57dcba8dfdf8578647 And remove required_config_file_values since we want to support running catalyst without a config file. Signed-off-by: Matt Turner --- catalyst/defaults.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 2f2c907f..412cb956 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -8,18 +8,20 @@ from DeComp.definitions import COMPRESSOR_PROGRAM_OPTIONS, XATTRS_OPTIONS from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS -required_config_file_values = [ - "distdir", - "portdir", - "sharedir", - "storedir", -] - -valid_config_file_values = required_config_file_values[:] -valid_config_file_values.extend([ +valid_config_file_values = frozenset([ "digests", + "distdir", "envscript", "options", + "port_logdir", + "repo_basedir", + "repo_name", + "repos", + "sharedir", + "storedir", + "target_distdir", + "target_pkgdir", + "var_tmpfs_portage", ]) confdefaults = { -- 2.26.2