From bfc2141626b767a764646367216c7926622f80f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Tue, 23 Mar 2021 22:48:34 +0000 Subject: [PATCH] Rename udd_tie_breaker -> popcon_tie_breaker. --- ognibuild/debian/fix_build.py | 4 ++-- ognibuild/debian/udd.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py index cfab2e5..9db884c 100644 --- a/ognibuild/debian/fix_build.py +++ b/ognibuild/debian/fix_build.py @@ -443,12 +443,12 @@ def versioned_package_fixers(session, packaging_context): def apt_fixers(apt, packaging_context) -> List[BuildFixer]: from ..resolver.apt import AptResolver - from .udd import udd_tie_breaker + from .udd import popcon_tie_breaker from .build_deps import BuildDependencyTieBreaker apt_tie_breakers = [ partial(python_tie_breaker, packaging_context.tree, packaging_context.subpath), BuildDependencyTieBreaker.from_session(apt.session), - udd_tie_breaker, + popcon_tie_breaker, ] resolver = AptResolver(apt, apt_tie_breakers) return [ diff --git a/ognibuild/debian/udd.py b/ognibuild/debian/udd.py index bd2f1ce..223eb3c 100644 --- a/ognibuild/debian/udd.py +++ b/ognibuild/debian/udd.py @@ -41,7 +41,7 @@ class UDD(object): 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 # build-depends{-indep,-arch} try: