applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[unpackfs] An entry knows where it is mounted

Browse source 
- `imgmountdir` no longer defined in `UnpackOperation.run()`
This commit is contained in:
Adriaan de Groot 2020-04-06 10:48:34 +02:00
parent 9b14bf6826
commit 391bd1098f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/unpackfs/main.py
View file

@ -79,7 +79,10 @@ class UnpackEntry:
def is_file(self):
return self.sourcefs == "file"
def do_count(self, imgmountdir):
def do_count(self):
"""
Counts the number of files this entry has.
"""
fslist = ""
if self.sourcefs == "squashfs":
@ -95,7 +98,7 @@ class UnpackEntry:
elif self.sourcefs == "ext4":
fslist = subprocess.check_output(
["find", imgmountdir, "-type", "f"]
["find", self.mountPoint, "-type", "f"]
)
elif self.is_file():
@ -113,8 +116,7 @@ class UnpackEntry:
A *file* entry (e.g. one with *sourcefs* set to *file*)
is not mounted and just ignored.
:param entry: the entry to mount (source is the important property)
:param imgmountdir: where to mount it
:param base: directory to place all the mounts in.
:returns: None, but throws if the mount failed
"""
@ -304,7 +306,7 @@ class UnpackOperation:
try:
for entry in self.entries:
entry.do_mount(source_mount_path)
entry.do_count(imgmountdir) # Fill in the entry.total
entry.do_count() # Fill in the entry.total
self.report_progress()
error_msg = self.unpack_image(entry, entry.mountPoint)