Improve messages in preparep.py.

This commit is contained in:
John Preston 2021-09-13 15:08:48 +03:00
parent 0c42bca111
commit 5a63428093
1 changed files with 25 additions and 18 deletions

View File

@ -247,7 +247,9 @@ def winFailOnEach(command):
return result return result
def run(command): def run(command):
print(command) print('---------------------------------COMMANDS-LIST----------------------------------')
print(command, end='')
print('--------------------------------------------------------------------------------')
if win: if win:
if os.path.exists("command.bat"): if os.path.exists("command.bat"):
os.remove("command.bat") os.remove("command.bat")
@ -330,29 +332,34 @@ def runStages():
if checkResult == 'Good': if checkResult == 'Good':
print('SKIPPING') print('SKIPPING')
continue continue
if checkResult == 'Stale' or checkResult == 'Forced': elif checkResult == 'NotFound':
print('NOT FOUND, ', end='')
elif checkResult == 'Stale' or checkResult == 'Forced':
if checkResult == 'Stale': if checkResult == 'Stale':
print('CHANGED, ', end='') print('CHANGED, ', end='')
print('(r)ebuild, rebuild (a)ll, (s)kip, (q)uit?: ', end='', flush=True) if rebuildStale:
while True: checkResult == 'Rebuild'
ch = b'r' if rebuildStale else getch() else:
if ch == b'q': print('(r)ebuild, rebuild (a)ll, (s)kip, (q)uit?: ', end='', flush=True)
finish(0) while True:
elif ch == b's': ch = b'r' if rebuildStale else getch()
checkResult = 'Skip' if ch == b'q':
break finish(0)
elif ch == b'r': elif ch == b's':
checkResult = 'Rebuild' checkResult = 'Skip'
break break
elif ch == b'a': elif ch == b'r':
checkResult = 'Rebuild' checkResult = 'Rebuild'
rebuildStale = True break
break elif ch == b'a':
checkResult = 'Rebuild'
rebuildStale = True
break
if checkResult == 'Skip': if checkResult == 'Skip':
print('SKIPPING') print('SKIPPING')
continue continue
clearCacheKey(stage) clearCacheKey(stage)
print('BUILDING') print('BUILDING:')
os.chdir(stage['directory']) os.chdir(stage['directory'])
commands = removeDir(stage['name']) + '\n' + stage['commands'] commands = removeDir(stage['name']) + '\n' + stage['commands']
if not run(commands): if not run(commands):