From 7359c07b96f99fbd5c83c47e3d4a90d6048fa78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 10 Feb 2021 14:02:46 +0000 Subject: [PATCH] Drop warn and note functions. --- ognibuild/__init__.py | 6 +++--- ognibuild/__main__.py | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ognibuild/__init__.py b/ognibuild/__init__.py index 7238a06..c693ada 100644 --- a/ognibuild/__init__.py +++ b/ognibuild/__init__.py @@ -21,10 +21,8 @@ import stat import sys -DEFAULT_PYTHON = "python3" - - class DetailedFailure(Exception): + def __init__(self, retcode, argv, error): self.retcode = retcode self.argv = argv @@ -45,12 +43,14 @@ def shebang_binary(p): class UpstreamRequirement(object): + def __init__(self, family, name): self.family = family self.name = name class UpstreamOutput(object): + def __init__(self, family, name): self.family = family self.name = name diff --git a/ognibuild/__main__.py b/ognibuild/__main__.py index 0e74b37..d7061f6 100644 --- a/ognibuild/__main__.py +++ b/ognibuild/__main__.py @@ -18,7 +18,6 @@ import logging import os import sys -from . import note, UpstreamPackage from .apt import UnidentifiedError from .buildsystem import NoBuildToolsFound, detect_buildsystems from .build import run_build @@ -127,12 +126,12 @@ def main(): # noqa: C901 return 1 except MissingDependencies as e: for req in e.requirements: - note("Missing dependency (%s:%s)" % (req.family, req.name)) + logging.info("Missing dependency (%s:%s)", (req.family, req.name)) for resolver in [ AptResolver.from_session(session), NativeResolver.from_session(session), ]: - note(" %s" % (resolver.explain([req]),)) + logging.info(" %s", resolver.explain([req])) return 2 return 0