[PATCH v2 2/2] autoregen.py: style tweaks

[Sam James <sam@gentoo.org>]

Maybe a bit easier to read now.

Signed-off-by: Sam James <sam@gentoo.org>
---
 builder/containers/autoregen.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index f33fb78..3d307ad 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -27,6 +27,13 @@ ENV += f' AUTOCONF={AUTOCONF_BIN} '
 ENV += f' ACLOCAL={ACLOCAL_BIN} '
 ENV += f' AUTOMAKE={AUTOMAKE_BIN}'
 
+# Directories we should skip entirely because they're vendored or have different
+# autotools versions.
+skip_dirs = [
+    # readline and minizip are maintained with different autotools versions
+    'readline',
+    'minizip'
+]
 
 config_folders = []
 
@@ -37,11 +44,12 @@ for root, _, files in os.walk('.'):
 
 for folder in sorted(config_folders):
     print(folder, flush=True)
-    # readline and minizip are maintained with different autotools versions
-    if (str(folder).endswith('readline')
-        or str(folder).endswith('minizip')):
-        continue;
+
+    if folder.stem in skip_dirs:
+        continue
+
     os.chdir(folder)
+
     configure_lines = open('configure.ac').read().splitlines()
     if any(True for line in configure_lines if line.startswith('AC_CONFIG_MACRO_DIRS')):
         # aclocal does not support the -f short option for force
@@ -49,19 +57,24 @@ for folder in sorted(config_folders):
         include_arg2 = ''
         if (folder / '..' / 'config').is_dir():
             include_arg = '-I../config'
+
         # this is really a hack just for binutils-gdb/gprofng/libcollector
         # make sure that the order of includes is done as --enable-maintainer-mode
         if (folder / '..' / '..' / 'config').is_dir():
             include_arg = '-I../..'
             include_arg2 = '-I../../config'
+
         subprocess.check_output(f'{ENV} {ACLOCAL_BIN} --force {include_arg} {include_arg2}', shell=True, encoding='utf8')
+
     if ((folder / 'config.in').is_file()
         or any(True for line in configure_lines if line.startswith('AC_CONFIG_HEADERS'))):
         subprocess.check_output(f'{ENV} {AUTOHEADER_BIN} -f', shell=True, encoding='utf8')
+
     # apparently automake is somehow unstable -> skip it for gotools
     if (any(True for line in configure_lines if line.startswith('AM_INIT_AUTOMAKE'))
             and not str(folder).endswith('gotools')):
         subprocess.check_output(f'{ENV} {AUTOMAKE_BIN} -f',
                                 shell=True, encoding='utf8')
+
     subprocess.check_output(f'{ENV} {AUTOCONF_BIN} -f', shell=True, encoding='utf8')
 
-- 
2.44.0