From 22299dc5852ab609b37171937f86c1a76739c714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Wed, 30 Jul 2014 15:06:39 +0200 Subject: [PATCH] No need for UnpackEntry.source_dir --- src/modules/unsquashfs/main.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/modules/unsquashfs/main.py b/src/modules/unsquashfs/main.py index ededb216d..3df2d5662 100644 --- a/src/modules/unsquashfs/main.py +++ b/src/modules/unsquashfs/main.py @@ -28,7 +28,7 @@ from collections import namedtuple from libcalamares import * UnpackEntry = namedtuple( - 'UnpackEntry', ['source', 'destination', 'source_dir']) + 'UnpackEntry', ['source', 'destination']) UnpackStatusEntry = namedtuple('UnpackStatusEntry', ['copied', 'total']) ON_POSIX = 'posix' in sys.builtin_module_names @@ -114,23 +114,22 @@ class UnsquashOperation: os.path.basename(entry.source))[0] imgmountdir = source_mount_path + os.sep + imgbasename os.mkdir(imgmountdir) - entry.source_dir = imgmountdir self.report_progress() - self.unsquash_image(entry) + self.unsquash_image(entry, imgmountdir) finally: shutil.rmtree(source_mount_path) - def unsquash_image(self, entry): + def unsquash_image(self, entry, imgmountdir): subprocess.check_call(["mount", entry.source, - entry.source_dir, + imgmountdir, "-t", "squashfs", "-o", "loop"]) try: - file_copy(entry.source_dir, + file_copy(imgmountdir, entry.destination, self.report_progress) finally: - subprocess.check_call(["umount", "-l", entry.source_dir]) + subprocess.check_call(["umount", "-l", imgmountdir]) def run():