commit: d8272847ef13019470eb7be28cf4cce985b8f4eb
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 08:34:58 2021 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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):
