timeshifter/zfs-backup
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: inline _import_from_directory

Browse Source
This commit is contained in:
timeshifter
2021-12-02 14:56:00 +01:00
parent 6ad8f88fd1
commit cb603eea74
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zfs-backup.py
+1 -4
View File
@@ -356,7 +356,7 @@ class ExternalPool(Pool):
if self._imported: if self._imported:
raise ValueError(ALREADY_IMPORTED, self.name) raise ValueError(ALREADY_IMPORTED, self.name)
self._disk.decrypt() self._disk.decrypt()
self._import_from_directory(MAPPER_PATH) # TODO inline? ZFS.import_pool_from_directory(self._name, MAPPER_PATH)
self._imported = True self._imported = True
def export(self) -> None: def export(self) -> None:
@@ -367,9 +367,6 @@ class ExternalPool(Pool):
self._imported = False self._imported = False
print(f"Exported {self.name}. Disk {self._disk.uuid} can be removed.") 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: def _export_pool(self) -> None:
# TODO cancel scrub if necessary # TODO cancel scrub if necessary
ZFS.export_pool(self._name) ZFS.export_pool(self._name)