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

Do not use os.path.join with entry["destination"]

Browse Source 
if it starts with a "/" then `destination` will be equal to entry["destination"]
This commit is contained in:
Aurélien Gâteau 2014-07-30 15:05:19 +02:00
parent ecb16dcdca
commit adda405f83
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/unsquashfs/main.py
View File

@ -159,8 +159,7 @@ def run():
for entry in job.configuration["unpack"]: for entry in job.configuration["unpack"]:
source = os.path.abspath(entry["source"]) source = os.path.abspath(entry["source"])
destination = os.path.abspath( destination = os.path.abspath(root_mount_point + entry["destination"])
os.path.join(root_mount_point, entry["destination"]))
if not os.path.isfile(source) or not os.path.isdir(destination): if not os.path.isfile(source) or not os.path.isdir(destination):
return ("Bad source or destination", return ("Bad source or destination",