From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: Re: [gentoo-catalyst] [PATCH 13/21] catalyst: Remove support for source_matching="loose"
Date: Wed, 20 May 2020 15:47:20 -0700 [thread overview]
Message-ID: <20200520154720.0f67f912@storm> (raw)
In-Reply-To: <20200520034226.2870937-13-mattst88@gentoo.org>
On Tue, 19 May 2020 20:42:18 -0700
Matt Turner <mattst88@gentoo.org> wrote:
> This does not seem like a useful feature to me.
>
> Signed-off-by: Matt Turner <mattst88@gentoo.org>
> ---
> catalyst/base/stagebase.py | 3 ---
> catalyst/defaults.py | 1 -
> catalyst/support.py | 6 +++---
> etc/catalyst.conf | 12 ------------
> 4 files changed, 3 insertions(+), 19 deletions(-)
>
> diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
> index f39895fe..febaf969 100644
> --- a/catalyst/base/stagebase.py
> +++ b/catalyst/base/stagebase.py
> @@ -130,8 +130,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
> decomp_opt=self.settings["decomp_opt"])
> self.accepted_extensions =
> self.decompressor.search_order_extensions(
> self.settings["decompressor_search_order"])
> - log.notice("Source file specification matching setting is:
> %s",
> - self.settings["source_matching"])
> log.notice("Accepted source file extensions search order:
> %s", self.accepted_extensions)
> # save resources, it is not always needed
> @@ -409,7 +407,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
> normpath(self.settings["storedir"] + "/builds/" +
> self.settings["source_subpath"]),
> self.accepted_extensions,
> - self.settings["source_matching"] in ["strict"]
> )
> log.debug('Source path returned from file_check is: %s',
> self.settings["source_path"])
> diff --git a/catalyst/defaults.py b/catalyst/defaults.py
> index 412cb956..14f671fe 100644
> --- a/catalyst/defaults.py
> +++ b/catalyst/defaults.py
> @@ -45,7 +45,6 @@ confdefaults = {
> "repos": "%(storedir)s/repos",
> "sharedir": "/usr/share/catalyst",
> "shdir": "%(sharedir)s/targets",
> - "source_matching": "strict",
> "storedir": "/var/tmp/catalyst",
> "target_distdir": "/var/cache/distfiles",
> "target_pkgdir": "/var/cache/binpkgs",
> diff --git a/catalyst/support.py b/catalyst/support.py
> index c4a5c797..a6a6854a 100644
> --- a/catalyst/support.py
> +++ b/catalyst/support.py
> @@ -59,7 +59,7 @@ def cmd(mycmd, env=None, debug=False,
> fail_func=None): print_traceback=False)
>
>
> -def file_check(filepath, extensions=None, strict=True):
> +def file_check(filepath, extensions=None):
> '''Check for the files existence and that only one exists
> if others are found with various extensions
> '''
> @@ -73,8 +73,8 @@ def file_check(filepath, extensions=None,
> strict=True): ".CONTENTS") and not x.endswith(".CONTENTS.gz") and not
> x.endswith(".DIGESTS")] if len(files) == 1:
> return files[0]
> - if len(files) > 1 and strict:
> - msg = "Ambiguos Filename: %s\nPlease specify the correct
> extension as well" % filepath
> + if len(files) > 1:
> + msg = "Ambiguous Filename: %s\nPlease specify the correct
> extension as well" % filepath raise CatalystError(msg,
> print_traceback=False) target_file = None
> for ext in extensions:
I find this strict/loose option useful for testing various changes.
I have my config set to loose. That way I can change compressors at
will without changing spec file or deleting files, or editing the spec
to specify the extension.
While I find it useful. It may not be for most users. I would be ok
with this if the others agree. Otherwise, this is not complex code to
maintain. In fact is barely any code at all.
> diff --git a/etc/catalyst.conf b/etc/catalyst.conf
> index f64fe971..d33be15f 100644
> --- a/etc/catalyst.conf
> +++ b/etc/catalyst.conf
> @@ -50,18 +50,6 @@ envscript="/etc/catalyst/catalystrc"
> # (These options can be used together)
> options="autoresume bindist kerncache pkgcache seedcache"
>
> -# 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"
> -#
> -# possible values are:
> -# "strict" meaning if more than one file of that name is present
> with any -# file extension, then it will raise an
> exception. -# "loose" meaning it will search for an existing
> filename with an added -# extension from an ordered list
> of extensions determined from the -#
> decompressor_search_order specification in the spec file or (default)
> -source_matching="strict" -
> # port_logdir is where all build logs will be kept. This dir will be
> automatically cleaned # of all logs over 30 days old. If left
> undefined the logs will remain in the build directory # as usual and
> get cleaned every time a stage build is restarted.
next prev parent reply other threads:[~2020-05-20 22:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-20 3:42 [gentoo-catalyst] [PATCH 01/21] targets: Remove copy_{file,symlink,lib} functions Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 02/21] targets: Remove check_genkernel_version() function Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 03/21] catalyst: Drop --cli option Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 04/21] catalyst: Remove PythonDir setting Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 05/21] catalyst: Switch internal snapshot option parsing to SpecParser Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 06/21] catalyst: Remove unused decompression_mode spec option Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 07/21] catalyst: Delete unused {required,valid}_build_targets Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 08/21] catalyst: Disallow DEBUG and VERBOSE in spec files Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 09/21] catalyst: Add decompressor_search_order as valid spec option Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 10/21] catalyst: Remove spec file options from valid_config_file_values Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 11/21] catalyst: Add a missing options to valid_config_file_values Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 12/21] catalyst: Disallow config file options in spec files Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 13/21] catalyst: Remove support for source_matching="loose" Matt Turner
2020-05-20 22:47 ` Brian Dolbec [this message]
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 14/21] catalyst: Convert catalyst.conf to TOML Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 15/21] catalyst: Verify config options against valid_config_file_values Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 16/21] catalyst: Don't even try to make envars from dicts Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 17/21] catalyst: Only emit true boolean envars Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 18/21] catalyst: Support emitting int/float envars Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 19/21] catalyst: Set jobs/load-average via catalyst.conf Matt Turner
[not found] ` <94424974-cfe8-9766-8712-ae6fa8bbf825@veremit.xyz>
2020-05-21 0:18 ` Matt Turner
[not found] ` <9d529c77-14b3-cb7b-f2ee-32b4bbc2f464@veremit.xyz>
2020-05-21 1:19 ` Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 20/21] catalyst: Configure distcc_hosts in the config file Matt Turner
2020-05-20 3:42 ` [gentoo-catalyst] [PATCH 21/21] catalyst: Drop ConfigParser Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200520154720.0f67f912@storm \
--to=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox