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

Drop warn and note functions.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-02-10 14:02:46 +00:00
parent 4d4c8d880b
commit 7359c07b96
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ognibuild/__init__.py
View file

@ -21,10 +21,8 @@ import stat
import sys import sys
DEFAULT_PYTHON = "python3"
class DetailedFailure(Exception): class DetailedFailure(Exception):
def __init__(self, retcode, argv, error): def __init__(self, retcode, argv, error):
self.retcode = retcode self.retcode = retcode
self.argv = argv self.argv = argv
@ -45,12 +43,14 @@ def shebang_binary(p):
class UpstreamRequirement(object): class UpstreamRequirement(object):
def __init__(self, family, name): def __init__(self, family, name):
self.family = family self.family = family
self.name = name self.name = name
class UpstreamOutput(object): class UpstreamOutput(object):
def __init__(self, family, name): def __init__(self, family, name):
self.family = family self.family = family
self.name = name self.name = name

5
ognibuild/__main__.py
View file

@ -18,7 +18,6 @@
import logging import logging
import os import os
import sys import sys
from . import note, UpstreamPackage
from .apt import UnidentifiedError from .apt import UnidentifiedError
from .buildsystem import NoBuildToolsFound, detect_buildsystems from .buildsystem import NoBuildToolsFound, detect_buildsystems
from .build import run_build from .build import run_build
@ -127,12 +126,12 @@ def main(): # noqa: C901
return 1 return 1
except MissingDependencies as e: except MissingDependencies as e:
for req in e.requirements: 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 [ for resolver in [
AptResolver.from_session(session), AptResolver.from_session(session),
NativeResolver.from_session(session), NativeResolver.from_session(session),
]: ]:
note(" %s" % (resolver.explain([req]),)) logging.info(" %s", resolver.explain([req]))
return 2 return 2
return 0 return 0