| 1 |
commit: d8272847ef13019470eb7be28cf4cce985b8f4eb |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 7 08:34:58 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 7 08:34:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d8272847 |
| 7 |
|
| 8 |
scripts/auto-bootstraps/analyse_result: deal with make.conf dir |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
scripts/auto-bootstraps/analyse_result.py | 23 ++++++++++++++++------- |
| 13 |
1 file changed, 16 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py |
| 16 |
index 23ff06c5f5..f15bffc9da 100755 |
| 17 |
--- a/scripts/auto-bootstraps/analyse_result.py |
| 18 |
+++ b/scripts/auto-bootstraps/analyse_result.py |
| 19 |
@@ -150,13 +150,22 @@ with os.scandir(resultsdir) as it: |
| 20 |
elapsedtime = int(l) |
| 21 |
|
| 22 |
mconf = os.path.join(resultsdir, arch, "%s" % d, "make.conf") |
| 23 |
- if os.path.exists(mconf): |
| 24 |
- with open(mconf, 'rb') as f: |
| 25 |
- l = [x.decode('utf-8', 'ignore') for x in f.readlines()] |
| 26 |
- l = list(filter(lambda x: 'USE=' in x, l)) |
| 27 |
- for x in l: |
| 28 |
- if 'libressl' in x: |
| 29 |
- haslssl = True |
| 30 |
+ conffiles = [] |
| 31 |
+ if os.path.isdir(mconf): |
| 32 |
+ with os.scandir(mconf) as it: |
| 33 |
+ for f in it: |
| 34 |
+ if f.is_file(): |
| 35 |
+ conffiles += [ f.name ] |
| 36 |
+ else: |
| 37 |
+ conffiles = [ mconf ] |
| 38 |
+ for mconf in conffiles: |
| 39 |
+ if os.path.exists(mconf): |
| 40 |
+ with open(mconf, 'rb') as f: |
| 41 |
+ l = [x.decode('utf-8', 'ignore') for x in f.readlines()] |
| 42 |
+ l = list(filter(lambda x: 'USE=' in x, l)) |
| 43 |
+ for x in l: |
| 44 |
+ if 'libressl' in x: |
| 45 |
+ haslssl = True |
| 46 |
|
| 47 |
mconf = os.path.join(resultsdir, arch, "%s" % d, "stage1.log") |
| 48 |
if os.path.exists(mconf): |
Archives