napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need for UnpackEntry.source_dir

Browse Source
This commit is contained in:
Aurélien Gâteau 2014-07-30 15:06:39 +02:00
parent 638a5c021c
commit 22299dc585
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/unsquashfs/main.py
View File

@ -28,7 +28,7 @@ from collections import namedtuple
from libcalamares import * from libcalamares import *
UnpackEntry = namedtuple( UnpackEntry = namedtuple(
'UnpackEntry', ['source', 'destination', 'source_dir']) 'UnpackEntry', ['source', 'destination'])
UnpackStatusEntry = namedtuple('UnpackStatusEntry', ['copied', 'total']) UnpackStatusEntry = namedtuple('UnpackStatusEntry', ['copied', 'total'])
ON_POSIX = 'posix' in sys.builtin_module_names ON_POSIX = 'posix' in sys.builtin_module_names
@ -114,23 +114,22 @@ class UnsquashOperation:
os.path.basename(entry.source))[0] os.path.basename(entry.source))[0]
imgmountdir = source_mount_path + os.sep + imgbasename imgmountdir = source_mount_path + os.sep + imgbasename
os.mkdir(imgmountdir) os.mkdir(imgmountdir)
entry.source_dir = imgmountdir
self.report_progress() self.report_progress()
self.unsquash_image(entry) self.unsquash_image(entry, imgmountdir)
finally: finally:
shutil.rmtree(source_mount_path) shutil.rmtree(source_mount_path)
def unsquash_image(self, entry): def unsquash_image(self, entry, imgmountdir):
subprocess.check_call(["mount", subprocess.check_call(["mount",
entry.source, entry.source,
entry.source_dir, imgmountdir,
"-t", "squashfs", "-o", "loop"]) "-t", "squashfs", "-o", "loop"])
try: try:
file_copy(entry.source_dir, file_copy(imgmountdir,
entry.destination, entry.destination,
self.report_progress) self.report_progress)
finally: finally:
subprocess.check_call(["umount", "-l", entry.source_dir]) subprocess.check_call(["umount", "-l", imgmountdir])
def run(): def run():