fixup! MK8S-25: Revert packaging.py to pre-PR state

Author: rdebay-scality

buildchain/buildchain/packaging.py

@@ -32,7 +32,6 @@
 import doit  # type: ignore
 
 from buildchain import builder
-from buildchain import config
 from buildchain import constants
 from buildchain import coreutils
 from buildchain import docker_command
@@ -46,7 +45,7 @@
 
 
 def _list_packages_to_build(
-    pkg_cats: Mapping[str, Mapping[str, Tuple[targets.Package, ...]]],
+    pkg_cats: Mapping[str, Mapping[str, Tuple[targets.Package, ...]]]
 ) -> Dict[str, List[str]]:
     return {
         version: [pkg.name for pkg in pkg_list]
@@ -150,27 +149,11 @@ def task__package_mkdir_iso_root() -> types.TaskDict:
 
 def task__package_mkdir_redhat_iso_root() -> types.TaskDict:
     """Create the RedHat packages root directory on the ISO."""
-
-    def clean() -> None:
-        """Clean RedHat directory including saltenv directory structure."""
-        # Remove saltenv directory structure created by repository index files
-        saltenv_dir = (
-            constants.REPO_REDHAT_ROOT
-            / f"{config.PROJECT_NAME.lower()}-{versions.VERSION}"
-        )
-        if saltenv_dir.exists():
-            coreutils.rm_rf(saltenv_dir)
-
-    mkdir_task = targets.Mkdir(
+    return targets.Mkdir(
         directory=constants.REPO_REDHAT_ROOT,
         task_dep=["_package_mkdir_iso_root"],
     ).task
 
-    # Add our custom cleanup function
-    mkdir_task["clean"] = [clean]
-
-    return mkdir_task
-
 
 def _package_mkdir_redhat_release_iso_root(releasever: str) -> types.TaskDict:
     """
@@ -280,7 +263,6 @@ def task__build_redhat_8_repositories() -> Iterator[types.TaskDict]:
 # }}}
 # RPM packages and repository {{{
 
-
 # Packages to build, per repository.
 def _rpm_package(name: str, releasever: str, sources: List[Path]) -> targets.RPMPackage:
     try:
@@ -380,11 +362,11 @@ def _rpm_package_metalk8s_sosreport(releasever: str) -> targets.RPMPackage:
 
 
 # Store these versions in a dict to use with doit.tools.config_changed
-_TO_DOWNLOAD_RPM_CONFIG: Dict[str, Dict[str, Optional[str]]] = (
-    _list_packages_to_download(
-        versions.REDHAT_PACKAGES,
-        _RPM_TO_BUILD_PKG_NAMES,
-    )
+_TO_DOWNLOAD_RPM_CONFIG: Dict[
+    str, Dict[str, Optional[str]]
+] = _list_packages_to_download(
+    versions.REDHAT_PACKAGES,
+    _RPM_TO_BUILD_PKG_NAMES,
 )