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

[unpackfs] Fix typo

Browse Source 
Apparently everyone shipping a squashfs image also has the tools
installed, because the error message reporting that the tools-are-
missing contained a reference to an undefined variable.
Fix that, and while here improve the error message so you
don't get a whole path as a title in the error message.

The slightly weird error-message construction is so that no
messages change and no translation work is needed.
This commit is contained in:
Adriaan de Groot 2021-09-27 20:48:28 +02:00
parent 16f8243fb3
commit 51898ea32b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -460,8 +460,9 @@ def run():
if shutil.which("unsquashfs") is None: if shutil.which("unsquashfs") is None:
libcalamares.utils.warning("Failed to find unsquashfs") libcalamares.utils.warning("Failed to find unsquashfs")
return (_("Failed to unpack image \"{}\"").format(self.source), return (_("Bad unsquash configuration"),
_("Failed to find unsquashfs, make sure you have the squashfs-tools package installed")) _("Failed to find unsquashfs, make sure you have the squashfs-tools package installed.") +
" " + _("Failed to unpack image \"{}\"").format(source))
unpack = list() unpack = list()