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

[unpackfs] Check for squashfs tools earlier

Browse Source
This commit is contained in:
Adriaan de Groot 2020-04-06 10:52:32 +02:00
parent 391bd1098f
commit 21f060c3fd
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,12 +86,6 @@ class UnpackEntry:
fslist = "" fslist = ""
if self.sourcefs == "squashfs": if self.sourcefs == "squashfs":
if shutil.which("unsquashfs") is None:
utils.warning("Failed to find unsquashfs")
return (_("Failed to unpack image \"{}\"").format(self.source),
_("Failed to find unsquashfs, make sure you have the squashfs-tools package installed"))
fslist = subprocess.check_output( fslist = subprocess.check_output(
["unsquashfs", "-l", self.source] ["unsquashfs", "-l", self.source]
) )
@ -397,6 +391,9 @@ def run():
supported_filesystems = get_supported_filesystems() supported_filesystems = get_supported_filesystems()
# Bail out before we start when there are obvious problems # Bail out before we start when there are obvious problems
# - unsupported filesystems
# - non-existent sources
# - missing tools for specific FS
for entry in job.configuration["unpack"]: for entry in job.configuration["unpack"]:
source = os.path.abspath(entry["source"]) source = os.path.abspath(entry["source"])
sourcefs = entry["sourcefs"] sourcefs = entry["sourcefs"]
@ -410,6 +407,12 @@ def run():
utils.warning("The source filesystem \"{}\" does not exist".format(source)) utils.warning("The source filesystem \"{}\" does not exist".format(source))
return (_("Bad unsquash configuration"), return (_("Bad unsquash configuration"),
_("The source filesystem \"{}\" does not exist").format(source)) _("The source filesystem \"{}\" does not exist").format(source))
if sourcefs == "squashfs":
if shutil.which("unsquashfs") is None:
utils.warning("Failed to find unsquashfs")
return (_("Failed to unpack image \"{}\"").format(self.source),
_("Failed to find unsquashfs, make sure you have the squashfs-tools package installed"))
unpack = list() unpack = list()