On Tue, 19 May 2020 20:42:18 -0700 Matt Turner <[email protected]> wrote:
> This does not seem like a useful feature to me. > > Signed-off-by: Matt Turner <[email protected]> > --- > 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.
