From 3daeee51b50c5b99291ad2fb53bcf9592cde0272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Sat, 3 Apr 2021 18:38:41 +0100 Subject: [PATCH] Add debcargo unacceptable predicate fixer. --- ognibuild/debian/fix_build.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py index 1b7a926..faadc30 100644 --- a/ognibuild/debian/fix_build.py +++ b/ognibuild/debian/fix_build.py @@ -111,6 +111,9 @@ from buildlog_consultant.common import ( NeedPgBuildExtUpdateControl, MissingPerlFile, ) +from buildlog_consultant.sbuild import ( + DebcargoUnacceptablePredicate, + ) from .build import ( DetailedDebianBuildFailure, @@ -427,6 +430,13 @@ def fix_missing_makefile_pl(error, phase, context): return False +def coerce_unaccpetable_predicate(error, phase, context): + from debmutate.debcargo import DebcargoEditor + with DebcargoEditor(context.abspath('debian/debcargo.toml')) as editor: + editor['allow_prerelease_deps'] = True + return context.commit('Enable allow_prerelease_deps.') + + class SimpleBuildFixer(BuildFixer): def __init__(self, packaging_context, problem_cls: Type[Problem], fn): self.context = packaging_context @@ -479,6 +489,7 @@ def versioned_package_fixers(session, packaging_context, apt): packaging_context, MissingConfigStatusInput, fix_missing_config_status_input ), SimpleBuildFixer(packaging_context, MissingPerlFile, fix_missing_makefile_pl), + SimpleBuildFixer(packaging_context, DebcargoUnacceptablePredicate, coerce_unaccpetable_predicate), ]