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

Support quiet mode for dist.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-01 18:20:21 +00:00
parent 354001c60a
commit 677358e0d5
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
5 changed files with 79 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ognibuild/debian/apt.py
View file

@ -62,7 +62,7 @@ class AptManager(object):
def searchers(self):
if self._searchers is None:
self._searchers = [
RemoteAptContentsFileSearcher.from_session(self.session),
AptContentsFileSearcher.from_session(self.session),
GENERATED_FILE_SEARCHER]
return self._searchers
@ -106,7 +106,7 @@ class ContentsFileNotFound(Exception):
"""The contents file was not found."""
class RemoteAptContentsFileSearcher(FileSearcher):
class AptContentsFileSearcher(FileSearcher):
def __init__(self):
self._db = {}
@ -233,7 +233,7 @@ class RemoteAptContentsFileSearcher(FileSearcher):
response = self._get(url + ext)
except HTTPError as e:
if e.status == 404:
continue
continue
raise
break
else:

25
ognibuild/debian/fix_build.py
View file

@ -42,6 +42,7 @@ from debmutate.debhelper import (
)
from debmutate.deb822 import (
Deb822Editor,
PkgRelation,
)
from debmutate.reformatting import (
FormattingUnpreservable,
@ -144,16 +145,17 @@ def add_build_dependency(
try:
with ControlEditor(path=control_path) as updater:
for binary in updater.binaries:
if binary["Package"] == requirement.package:
raise CircularDependency(requirement.package)
updater.source["Build-Depends"] = ensure_relation(
updater.source.get("Build-Depends", ""),
requirement.relations)
if requirement.touches_package(binary["Package"]):
raise CircularDependency(binary["Package"])
for rel in requirement.relations:
updater.source["Build-Depends"] = ensure_relation(
updater.source.get("Build-Depends", ""),
PkgRelation.str([rel]))
except FormattingUnpreservable as e:
logging.info("Unable to edit %s in a way that preserves formatting.", e.path)
return False
desc = PkgRelation.str(requirement.relations)
desc = requirement.pkg_relation_str()
if not updater.changed:
logging.info("Giving up; dependency %s was already present.", desc)
@ -193,16 +195,17 @@ def add_test_dependency(
command_counter += 1
if name != testname:
continue
control["Depends"] = ensure_relation(
control.get("Depends", ""),
requirement.relations)
for rel in requirement.relations:
control["Depends"] = ensure_relation(
control.get("Depends", ""),
PkgRelation.str([rel]))
except FormattingUnpreservable as e:
logging.info("Unable to edit %s in a way that preserves formatting.", e.path)
return False
if not updater.changed:
return False
desc = PkgRelation.str(requirement.relations)
desc = requirement.pkg_relation_str()
logging.info("Adding dependency to test %s: %s", testname, desc)
return commit_debian_changes(
@ -240,7 +243,7 @@ def commit_debian_changes(
def targeted_python_versions(tree: Tree) -> Set[str]:
with tree.get_file("debian/control") as f:
control = Deb822(f)
build_depends = PkgRelation.parse_relations(control.get("Build-Depends", ""))
build_depends = PkgRelation.parse(control.get("Build-Depends", ""))
all_build_deps: Set[str] = set()
for or_deps in build_depends:
all_build_deps.update(or_dep["name"] for or_dep in or_deps)