Fix regression that enforced merge_simple_packages
This commit is contained in:
parent
76df10ee92
commit
bbfc338734
1 changed files with 6 additions and 0 deletions
|
|
@ -367,6 +367,10 @@ def _role_name_from_unit(unit: str) -> str:
|
||||||
return _safe_name(base)
|
return _safe_name(base)
|
||||||
|
|
||||||
|
|
||||||
|
def _role_name_from_pkg(pkg: str) -> str:
|
||||||
|
return _safe_name(pkg)
|
||||||
|
|
||||||
|
|
||||||
def _copy_into_bundle(
|
def _copy_into_bundle(
|
||||||
bundle_dir: str, role_name: str, abs_path: str, src_rel: str
|
bundle_dir: str, role_name: str, abs_path: str, src_rel: str
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|
@ -1644,6 +1648,8 @@ def harvest(
|
||||||
manual_pkgs_skipped.append(pkg)
|
manual_pkgs_skipped.append(pkg)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
role = _role_name_from_pkg(pkg)
|
||||||
|
|
||||||
notes: List[str] = []
|
notes: List[str] = []
|
||||||
excluded: List[ExcludedFile] = []
|
excluded: List[ExcludedFile] = []
|
||||||
managed: List[ManagedFile] = []
|
managed: List[ManagedFile] = []
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue