From 6e9aa624607ea2be12e87c7d13d0586fb9ffde23 Mon Sep 17 00:00:00 2001 From: "K. Lange" Date: Thu, 19 Jul 2018 09:38:20 +0900 Subject: [PATCH] Guess we don't *need* py 3.6... --- util/check-reqs.sh | 4 ++-- util/update-devtable.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/check-reqs.sh b/util/check-reqs.sh index b0077340..ec175835 100755 --- a/util/check-reqs.sh +++ b/util/check-reqs.sh @@ -2,8 +2,8 @@ RET=0 -if ! which python3.6 >/dev/null; then - echo "python3.6 is required to run build tools (and eventually cross-compile python3.6)" +if ! which python3 >/dev/null; then + echo "python3 is required to run build tools - 3.6 is recommended as it is needed to cross-compile itself" RET=1 fi diff --git a/util/update-devtable.py b/util/update-devtable.py index f384ecd0..046314f0 100755 --- a/util/update-devtable.py +++ b/util/update-devtable.py @@ -11,11 +11,11 @@ with open('util/devtable','w') as devtable: # Now add user home directories for user_details in [('local',1000)]: user, uid = user_details - for path in glob.glob(f'./base/home/{user}/**',recursive=True): + for path in glob.glob('./base/home/{user}/**'.format(user=user),recursive=True): p = Path(path) path_mod = path.replace('./base','') path_type = 'd' if p.is_dir() else 'f' st = os.stat(path) mode = '{:o}'.format(st.st_mode & 0o7777) - devtable.write(f'{path_mod} {path_type} {mode} {uid} {uid} - - - - -\n') + devtable.write('{path_mod} {path_type} {mode} {uid} {uid} - - - - -\n'.format(path_mod=path_mod,path_type=path_type,mode=mode,uid=uid))