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

Allow passing in fixers.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-04-01 21:56:28 +01:00
parent 697b279953
commit 62b5af617f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ognibuild/debian/fix_build.py
View file

@ -500,6 +500,15 @@ def apt_fixers(apt, packaging_context) -> List[BuildFixer]:
]
def default_fixers(local_tree, subpath, apt, committer=None, update_changelog=None):
packaging_context = DebianPackagingContext(
local_tree, subpath, committer, update_changelog
)
return versioned_package_fixers(apt.session, packaging_context, apt) + apt_fixers(
apt, packaging_context
)
def build_incrementally(
local_tree,
apt,
@ -513,14 +522,13 @@ def build_incrementally(
subpath="",
source_date_epoch=None,
update_changelog=True,
fixers=None
):
fixed_errors = []
packaging_context = DebianPackagingContext(
local_tree, subpath, committer, update_changelog
)
fixers = versioned_package_fixers(apt.session, packaging_context, apt) + apt_fixers(
apt, packaging_context
)
if fixers is None:
fixers = default_fixers(
local_tree, subpath, apt, committer=committer,
update_changelog=update_changelog)
logging.info("Using fixers: %r", fixers)
while True:
try: