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

Rename udd_tie_breaker -> popcon_tie_breaker.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-23 22:48:34 +00:00
parent ce02dd4a85
commit bfc2141626
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ognibuild/debian/fix_build.py
View file

@ -443,12 +443,12 @@ def versioned_package_fixers(session, packaging_context):
def apt_fixers(apt, packaging_context) -> List[BuildFixer]: def apt_fixers(apt, packaging_context) -> List[BuildFixer]:
from ..resolver.apt import AptResolver from ..resolver.apt import AptResolver
from .udd import udd_tie_breaker from .udd import popcon_tie_breaker
from .build_deps import BuildDependencyTieBreaker from .build_deps import BuildDependencyTieBreaker
apt_tie_breakers = [ apt_tie_breakers = [
partial(python_tie_breaker, packaging_context.tree, packaging_context.subpath), partial(python_tie_breaker, packaging_context.tree, packaging_context.subpath),
BuildDependencyTieBreaker.from_session(apt.session), BuildDependencyTieBreaker.from_session(apt.session),
udd_tie_breaker, popcon_tie_breaker,
] ]
resolver = AptResolver(apt, apt_tie_breakers) resolver = AptResolver(apt, apt_tie_breakers)
return [ return [

2
ognibuild/debian/udd.py
View file

@ -41,7 +41,7 @@ class UDD(object):
return cursor.fetchone()[0] return cursor.fetchone()[0]
def udd_tie_breaker(candidates): def popcon_tie_breaker(candidates):
# TODO(jelmer): Pick package based on what appears most commonly in # TODO(jelmer): Pick package based on what appears most commonly in
# build-depends{-indep,-arch} # build-depends{-indep,-arch}
try: try: