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

[unpackfs] Improve error message wording

Browse Source
This commit is contained in:
Adriaan de Groot 2019-01-25 06:08:56 -05:00
parent 56d05d5834
commit e96a29b1b9
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

@ -286,13 +286,13 @@ def run():
root_mount_point = globalstorage.value("rootMountPoint") root_mount_point = globalstorage.value("rootMountPoint")
if not root_mount_point: if not root_mount_point:
return ("No mount point for root partition in globalstorage", return ("No mount point for root partition",
"globalstorage does not contain a \"rootMountPoint\" key, " "globalstorage does not contain a \"rootMountPoint\" key, "
"doing nothing") "doing nothing")
if not os.path.exists(root_mount_point): if not os.path.exists(root_mount_point):
return ("Bad mount point for root partition in globalstorage", return ("Bad mount point for root partition",
"globalstorage[\"rootMountPoint\"] is \"{}\", which does not " "rootMountPoint is \"{}\", which does not "
"exist, doing nothing".format(root_mount_point)) "exist, doing nothing".format(root_mount_point))
supported_filesystems = get_supported_filesystems() supported_filesystems = get_supported_filesystems()
@ -304,15 +304,18 @@ def run():
sourcefs = entry["sourcefs"] sourcefs = entry["sourcefs"]
if sourcefs not in supported_filesystems: if sourcefs not in supported_filesystems:
return "Bad filesystem", "sourcefs=\"{}\"".format(sourcefs) return ("Bad unsquash configuration",
"The filesystem for \"{}\" ({}) is not supported".format(source, sourcefs))
destination = os.path.abspath(root_mount_point + entry["destination"]) destination = os.path.abspath(root_mount_point + entry["destination"])
if not os.path.exists(source): if not os.path.exists(source):
return "Bad source", "source=\"{}\"".format(source) return ("Bad unsquash configuration",
"The source filesystem \"{}\" does not exist".format(source))
if not os.path.isdir(destination): if not os.path.isdir(destination):
return "Bad destination", "destination=\"{}\"".format(destination) return ("Bad unsquash configuration",
"The destination \"{}\" in the target system is not a directory".format(destination))
unpack.append(UnpackEntry(source, sourcefs, destination)) unpack.append(UnpackEntry(source, sourcefs, destination))