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

Some renames.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-01 15:00:32 +00:00
parent 217e87a3a8
commit 78b59759c9
10 changed files with 57 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ognibuild/debian/apt.py
View file

@ -39,11 +39,9 @@ def run_apt(session: Session, args: List[str]) -> None:
match, error = find_apt_get_failure(lines)
if error is not None:
raise DetailedFailure(retcode, args, error)
if match is not None:
raise UnidentifiedError(retcode, args, lines, secondary=(match.lineno, match.line))
while lines and lines[-1] == "":
lines.pop(-1)
raise UnidentifiedError(retcode, args, lines)
raise UnidentifiedError(retcode, args, lines, secondary=match)
class FileSearcher(object):

4
ognibuild/debian/fix_build.py
View file

@ -81,7 +81,7 @@ from buildlog_consultant.sbuild import (
)
from ..fix_build import BuildFixer, resolve_error, DependencyContext
from ..buildlog import UpstreamRequirementFixer
from ..buildlog import RequirementFixer
from ..resolver.apt import (
AptRequirement,
get_package_for_python_module,
@ -525,7 +525,7 @@ def apt_fixers(apt) -> List[BuildFixer]:
SimpleBuildFixer(MissingPythonModule, fix_missing_python_module),
SimpleBuildFixer(MissingPythonDistribution, fix_missing_python_distribution),
SimpleBuildFixer(AptFetchFailure, retry_apt_failure),
UpstreamRequirementFixer(resolver),
RequirementFixer(resolver),
]