billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undo fix build changes.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-25 19:22:08 +00:00
parent 16d37dc045
commit 85575ad526
1 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ognibuild/fix_build.py
View file

@ -69,34 +69,21 @@ def run_detecting_problems(session: Session, args: List[str], **kwargs):
def run_with_build_fixers(session: Session, args: List[str], fixers: List[BuildFixer], **kwargs): def run_with_build_fixers(session: Session, args: List[str], fixers: List[BuildFixer], **kwargs):
fixed_errors = [] fixed_errors = []
while True: while True:
to_resolve = []
try: try:
run_detecting_problems(session, args, **kwargs) run_detecting_problems(session, args, **kwargs)
except DetailedFailure as e: except DetailedFailure as e:
to_resolve.append(e)
else:
return
while to_resolve:
e = to_resolve.pop(-1)
logging.info("Identified error: %r", e.error) logging.info("Identified error: %r", e.error)
if e.error in fixed_errors: if e.error in fixed_errors:
logging.warning( logging.warning(
"Failed to resolve error %r, it persisted. Giving up.", e.error "Failed to resolve error %r, it persisted. Giving up.", e.error
) )
raise e raise DetailedFailure(e.retcode, args, e.error)
try: if not resolve_error(e.error, None, fixers=fixers):
if not resolve_error(e.error, None, fixers=fixers): logging.warning("Failed to find resolution for error %r. Giving up.", e.error)
logging.warning("Failed to find resolution for error %r. Giving up.", e.error) raise DetailedFailure(e.retcode, args, e.error)
raise e fixed_errors.append(e.error)
except DetailedFailure as n: else:
logging.info('New error %r while resolving %r', n, e) return
if n in to_resolve:
raise
to_resolve.append(e)
to_resolve.append(n)
else:
fixed_errors.append(e.error)
def resolve_error(error, phase, fixers): def resolve_error(error, phase, fixers):