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

unpackfs: code dedup

Browse Source
This commit is contained in:
Daniel Hillenbrand 2014-08-19 19:12:48 +02:00
parent 4cd217e4b6
commit 148a29d506
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/unpackfs/main.py
View File

@ -120,16 +120,17 @@ class UnpackOperation:
self.mount_image(entry, imgmountdir) self.mount_image(entry, imgmountdir)
fslist = ""
if entry.sourcefs == "squashfs": if entry.sourcefs == "squashfs":
sqfslist = subprocess.check_output(["unsquashfs", fslist = subprocess.check_output(["unsquashfs",
"-l", "-l",
entry.source]) entry.source])
entry.total = len(sqfslist.splitlines())
if entry.sourcefs == "ext4": if entry.sourcefs == "ext4":
fslist = subprocess.check_output(["find", fslist = subprocess.check_output(["find",
imgmountdir, imgmountdir,
"-type", "f"]) "-type", "f"])
entry.total = len(fslist.splitlines()) entry.total = len(fslist.splitlines())
self.report_progress() self.report_progress()
error_msg = self.unpack_image(entry, imgmountdir) error_msg = self.unpack_image(entry, imgmountdir)