revert more changes related to mount dependencies

oamg · Aug 13, 2024 · 269811a · 269811a
1 parent 81750f2
commit 269811a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 46 deletions.
diff --git a/repos/system_upgrade/common/actors/dnfdryrun/actor.py b/repos/system_upgrade/common/actors/dnfdryrun/actor.py
@@ -1,7 +1,5 @@
-import contextlib
-
 from leapp.actors import Actor
-from leapp.libraries.common import dnfplugin, mounting
+from leapp.libraries.common import dnfplugin
 from leapp.models import (
     BootContent,
     DNFPluginTask,
@@ -53,14 +51,9 @@ def process(self):
         target_iso = next(self.consume(TargetOSInstallationImage), None)
         on_aws = bool(rhui_info and rhui_info.provider == 'aws')
 
-        with contextlib.ExitStack() as exit_stack:
-            mounting.populate_exit_stack_with_mount_dependencies(exit_stack,
-                                                                 target_userspace_info.setup_mount_dependencies)
-
-            dnfplugin.perform_dry_run(
-                tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info,
-                xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws,
-                target_iso=target_iso,
-            )
-
-            self.produce(TransactionDryRun())
+        dnfplugin.perform_dry_run(
+            tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info,
+            xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws,
+            target_iso=target_iso,
+        )
+        self.produce(TransactionDryRun())
diff --git a/repos/system_upgrade/common/actors/dnfpackagedownload/actor.py b/repos/system_upgrade/common/actors/dnfpackagedownload/actor.py
@@ -1,7 +1,5 @@
-import contextlib
-
 from leapp.actors import Actor
-from leapp.libraries.common import dnfplugin, mounting
+from leapp.libraries.common import dnfplugin
 from leapp.models import (
     DNFPluginTask,
     DNFWorkaround,
@@ -51,11 +49,8 @@ def process(self):
         on_aws = bool(rhui_info and rhui_info.provider.startswith('aws'))
         target_iso = next(self.consume(TargetOSInstallationImage), None)
 
-        with contextlib.ExitStack() as exit_stack:
-            mount_deps = target_userspace_info.setup_mount_dependencies
-            mounting.populate_exit_stack_with_mount_dependencies(exit_stack, mount_deps)
-            dnfplugin.perform_rpm_download(
-                tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info,
-                xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws,
-                target_iso=target_iso
-            )
+        dnfplugin.perform_rpm_download(
+            tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info,
+            xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, on_aws=on_aws,
+            target_iso=target_iso
+        )
diff --git a/repos/system_upgrade/common/actors/dnftransactioncheck/actor.py b/repos/system_upgrade/common/actors/dnftransactioncheck/actor.py
@@ -1,7 +1,5 @@
-import contextlib
-
 from leapp.actors import Actor
-from leapp.libraries.common import dnfplugin, mounting
+from leapp.libraries.common import dnfplugin
 from leapp.models import (
     DNFPluginTask,
     DNFWorkaround,
@@ -44,11 +42,7 @@ def process(self):
         target_iso = next(self.consume(TargetOSInstallationImage), None)
 
         if target_userspace_info:
-            with contextlib.ExitStack() as exit_stack:
-                mount_deps = target_userspace_info.setup_mount_dependencies
-                mounting.populate_exit_stack_with_mount_dependencies(exit_stack, mount_deps)
-
-                dnfplugin.perform_transaction_check(
-                    tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info,
-                    xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, target_iso=target_iso
-                )
+            dnfplugin.perform_transaction_check(
+                tasks=tasks, used_repos=used_repos, target_userspace_info=target_userspace_info,
+                xfs_info=xfs_info, storage_info=storage_info, plugin_info=plugin_info, target_iso=target_iso
+            )
diff --git a/repos/system_upgrade/common/actors/dnfupgradetransaction/actor.py b/repos/system_upgrade/common/actors/dnfupgradetransaction/actor.py
@@ -1,8 +1,7 @@
-import contextlib
 import shutil
 
 from leapp.actors import Actor
-from leapp.libraries.common import dnfplugin, mounting
+from leapp.libraries.common import dnfplugin
 from leapp.libraries.stdlib import run
 from leapp.models import (
     DNFPluginTask,
@@ -53,15 +52,11 @@ def process(self):
         target_userspace_info = next(self.consume(TargetUserSpaceInfo), None)
         xfs_info = next(self.consume(XFSPresence), XFSPresence())
 
-        with contextlib.ExitStack() as exit_stack:
-            mount_deps = target_userspace_info.setup_mount_dependencies
-            mounting.populate_exit_stack_with_mount_dependencies(exit_stack, mount_deps)
-            dnfplugin.perform_transaction_install(tasks=tasks, used_repos=used_repos, storage_info=storage_info,
-                                                  target_userspace_info=target_userspace_info, plugin_info=plugin_info,
-                                                  xfs_info=xfs_info)
-
+        dnfplugin.perform_transaction_install(
+            tasks=tasks, used_repos=used_repos, storage_info=storage_info, target_userspace_info=target_userspace_info,
+            plugin_info=plugin_info, xfs_info=xfs_info
+        )
         self.produce(TransactionCompleted())
-
         userspace = next(self.consume(TargetUserSpaceInfo), None)
         if userspace:
             try: