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

Pass in subpath.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-17 03:15:45 +00:00
parent b988dd2324
commit 5b872c10a3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ognibuild/debian/fix_build.py
View file

@ -297,8 +297,8 @@ def commit_debian_changes(
return True return True
def targeted_python_versions(tree: Tree) -> Set[str]: def targeted_python_versions(tree: Tree, subpath: str) -> Set[str]:
with tree.get_file("debian/control") as f: with tree.get_file(os.path.join(subpath, "debian/control")) as f:
control = Deb822(f) control = Deb822(f)
build_depends = PkgRelation.parse_relations(control.get("Build-Depends", "")) build_depends = PkgRelation.parse_relations(control.get("Build-Depends", ""))
all_build_deps: Set[str] = set() all_build_deps: Set[str] = set()
@ -315,7 +315,7 @@ def targeted_python_versions(tree: Tree) -> Set[str]:
def fix_missing_python_distribution(error, context): # noqa: C901 def fix_missing_python_distribution(error, context): # noqa: C901
targeted = targeted_python_versions(context.tree) targeted = targeted_python_versions(context.tree, context.subpath)
default = not targeted default = not targeted
pypy_pkg = context.apt.get_package_for_paths( pypy_pkg = context.apt.get_package_for_paths(
@ -381,7 +381,7 @@ def fix_missing_python_distribution(error, context): # noqa: C901
def fix_missing_python_module(error, context): def fix_missing_python_module(error, context):
if getattr(context, "tree", None) is not None: if getattr(context, "tree", None) is not None:
targeted = targeted_python_versions(context.tree) targeted = targeted_python_versions(context.tree, context.subpath)
else: else:
targeted = set() targeted = set()
default = not targeted default = not targeted