diff options
Diffstat (limited to 'src/debputy/commands/debputy_cmd/__main__.py')
-rw-r--r-- | src/debputy/commands/debputy_cmd/__main__.py | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/debputy/commands/debputy_cmd/__main__.py b/src/debputy/commands/debputy_cmd/__main__.py index d894731..27edf49 100644 --- a/src/debputy/commands/debputy_cmd/__main__.py +++ b/src/debputy/commands/debputy_cmd/__main__.py @@ -39,6 +39,7 @@ from debputy.commands.debputy_cmd.context import ( from debputy.commands.debputy_cmd.dc_util import flatten_ppfs from debputy.commands.debputy_cmd.output import _stream_to_pager from debputy.dh_migration.migrators import MIGRATORS +from debputy.dh_migration.migrators_impl import read_dh_addon_sequences from debputy.exceptions import ( DebputyRuntimeError, PluginNotFoundError, @@ -93,8 +94,6 @@ from debputy.dh_migration.models import AcceptableMigrationIssues from debputy.packages import BinaryPackage from debputy.debhelper_emulation import ( dhe_pkgdir, - parse_drules_for_addons, - extract_dh_addons_from_control, ) from debputy.deb_packaging_support import ( @@ -1053,19 +1052,6 @@ def _merge_ppfs( _merge_list(details, "documentation-uris", documentation_uris) -def _is_debputy_package(context: CommandContext, dh_rules_addons: Set[str]) -> bool: - drules = context.debian_dir.get("rules") - sequences = set() - source_package = context.source_package() - if drules is not None and not drules.is_dir: - parse_drules_for_addons(drules, dh_rules_addons) - extract_dh_addons_from_control(source_package.fields, sequences) - sequences.update(dh_rules_addons) - return ( - "debputy" in sequences or "zz-debputy" in sequences or "zz_debputy" in sequences - ) - - def _extract_dh_compat_level() -> Tuple[Optional[int], int]: try: output = subprocess.check_output( @@ -1254,8 +1240,18 @@ def _annotate_debian_directory(context: CommandContext) -> None: annotated: List[PackagingFileInfo] = [] seen_paths = set() - drules_sequences = set() - is_debputy_package = _is_debputy_package(context, drules_sequences) + r = read_dh_addon_sequences(context.debian_dir) + if r is not None: + bd_sequences, dr_sequences = r + drules_sequences = bd_sequences | dr_sequences + else: + drules_sequences = set() + is_debputy_package = ( + "debputy" in drules_sequences + or "zz-debputy" in drules_sequences + or "zz_debputy" in drules_sequences + or "zz-debputy-rrr" in drules_sequences + ) dh_compat_level, dh_assistant_exit_code = _extract_dh_compat_level() dh_issues = [] |