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

[unpackfs] Support multiple items better

Browse source 
- it's ok if item one creates directories where item two will write,
   so don't check for existence of all directories on start-up.

Reported by ArcoLinux.
This commit is contained in:
Adriaan de Groot 2019-10-08 16:19:39 +02:00
parent d58fdaa2cd
commit 05c0398126
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -378,6 +378,7 @@ def run():
unpack = list() unpack = list()
is_first = True
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"]
@ -385,10 +386,14 @@ def run():
if not os.path.isdir(destination): if not os.path.isdir(destination):
utils.warning(("The destination \"{}\" in the target system is not a directory").format(destination)) utils.warning(("The destination \"{}\" in the target system is not a directory").format(destination))
return (_("Bad unsquash configuration"), if is_first:
_("The destination \"{}\" in the target system is not a directory").format(destination)) return (_("Bad unsquash configuration"),
_("The destination \"{}\" in the target system is not a directory").format(destination))
else:
utils.debug(".. assuming that the previous targets will create that directory.")
unpack.append(UnpackEntry(source, sourcefs, destination)) unpack.append(UnpackEntry(source, sourcefs, destination))
is_first = False
unpackop = UnpackOperation(unpack) unpackop = UnpackOperation(unpack)