From 148a29d506739c6038eefc18aa89e79ce4823f17 Mon Sep 17 00:00:00 2001 From: Daniel Hillenbrand Date: Tue, 19 Aug 2014 19:12:48 +0200 Subject: [PATCH] unpackfs: code dedup --- src/modules/unpackfs/main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py index 0124ef4bb..8e5da8c78 100644 --- a/src/modules/unpackfs/main.py +++ b/src/modules/unpackfs/main.py @@ -120,16 +120,17 @@ class UnpackOperation: self.mount_image(entry, imgmountdir) + fslist = "" + if entry.sourcefs == "squashfs": - sqfslist = subprocess.check_output(["unsquashfs", + fslist = subprocess.check_output(["unsquashfs", "-l", entry.source]) - entry.total = len(sqfslist.splitlines()) if entry.sourcefs == "ext4": fslist = subprocess.check_output(["find", imgmountdir, "-type", "f"]) - entry.total = len(fslist.splitlines()) + entry.total = len(fslist.splitlines()) self.report_progress() error_msg = self.unpack_image(entry, imgmountdir)