From cb603eea749af6af1ba2a647d64850f3da3392dc Mon Sep 17 00:00:00 2001
From: timeshifter <timeshifter@sumatrae>
Date: Thu, 2 Dec 2021 14:56:00 +0100
Subject: [PATCH] refactor: inline _import_from_directory

---
 zfs-backup.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/zfs-backup.py b/zfs-backup.py
index 568c827..c6a71a7 100755
--- a/zfs-backup.py
+++ b/zfs-backup.py
@@ -356,7 +356,7 @@ class ExternalPool(Pool):
         if self._imported:
             raise ValueError(ALREADY_IMPORTED, self.name)
         self._disk.decrypt()
-        self._import_from_directory(MAPPER_PATH)  # TODO inline?
+        ZFS.import_pool_from_directory(self._name, MAPPER_PATH)
         self._imported = True
 
     def export(self) -> None:
@@ -367,9 +367,6 @@ class ExternalPool(Pool):
         self._imported = False
         print(f"Exported {self.name}. Disk {self._disk.uuid} can be removed.")
 
-    def _import_from_directory(self, directory: Path) -> None:
-        ZFS.import_pool_from_directory(self._name, directory)
-
     def _export_pool(self) -> None:
         # TODO cancel scrub if necessary
         ZFS.export_pool(self._name)