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 998221382C5 for ; Wed, 20 May 2020 01:52:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9751BE0871; Wed, 20 May 2020 01:52:31 +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 7497BE0871 for ; Wed, 20 May 2020 01:52:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6967234F133 for ; Wed, 20 May 2020 01:52:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8973A260 for ; Wed, 20 May 2020 01:52:26 +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: <1589939377.adfb01ca3a36e74f500e384177404563023aa12b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: etc/, catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py catalyst/defaults.py catalyst/support.py etc/catalyst.conf X-VCS-Directories: catalyst/base/ catalyst/ etc/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: adfb01ca3a36e74f500e384177404563023aa12b X-VCS-Branch: wip/mattst88 Date: Wed, 20 May 2020 01:52:26 +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: da0f5840-1c76-4396-b237-c0eb70b85c7b X-Archives-Hash: 06cc7751bdc6af359be406b882e754ab Message-ID: <20200520015226.ZXgrCyKXJ3a_hwqRW7uxzUafyD0xUMsfxK_9kF-npEw@z> commit: adfb01ca3a36e74f500e384177404563023aa12b Author: Matt Turner gentoo org> AuthorDate: Sat May 16 21:53:11 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed May 20 01:49:37 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=adfb01ca catalyst: Remove support for source_matching="loose" This does not seem like a useful feature to me. Signed-off-by: Matt Turner 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: 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.