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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 313F7158086 for ; Tue, 7 Dec 2021 08:35:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82E212BC002; Tue, 7 Dec 2021 08:35:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E3082BC002 for ; Tue, 7 Dec 2021 08:35:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9B81834309C for ; Tue, 7 Dec 2021 08:35:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA8B81F2 for ; Tue, 7 Dec 2021 08:35:24 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1638866098.d8272847ef13019470eb7be28cf4cce985b8f4eb.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/auto-bootstraps/analyse_result.py X-VCS-Directories: scripts/auto-bootstraps/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d8272847ef13019470eb7be28cf4cce985b8f4eb X-VCS-Branch: master Date: Tue, 7 Dec 2021 08:35:24 +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: 6fe23841-288f-4a63-bf8a-120b5c07fb6f X-Archives-Hash: b31f624ba661a0ce444f29219744c594 commit: d8272847ef13019470eb7be28cf4cce985b8f4eb Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 7 08:34:58 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 7 08:34:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d8272847 scripts/auto-bootstraps/analyse_result: deal with make.conf dir Signed-off-by: Fabian Groffen gentoo.org> scripts/auto-bootstraps/analyse_result.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py index 23ff06c5f5..f15bffc9da 100755 --- a/scripts/auto-bootstraps/analyse_result.py +++ b/scripts/auto-bootstraps/analyse_result.py @@ -150,13 +150,22 @@ with os.scandir(resultsdir) as it: elapsedtime = int(l) mconf = os.path.join(resultsdir, arch, "%s" % d, "make.conf") - if os.path.exists(mconf): - with open(mconf, 'rb') as f: - l = [x.decode('utf-8', 'ignore') for x in f.readlines()] - l = list(filter(lambda x: 'USE=' in x, l)) - for x in l: - if 'libressl' in x: - haslssl = True + conffiles = [] + if os.path.isdir(mconf): + with os.scandir(mconf) as it: + for f in it: + if f.is_file(): + conffiles += [ f.name ] + else: + conffiles = [ mconf ] + for mconf in conffiles: + if os.path.exists(mconf): + with open(mconf, 'rb') as f: + l = [x.decode('utf-8', 'ignore') for x in f.readlines()] + l = list(filter(lambda x: 'USE=' in x, l)) + for x in l: + if 'libressl' in x: + haslssl = True mconf = os.path.join(resultsdir, arch, "%s" % d, "stage1.log") if os.path.exists(mconf):