YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1190 from YunoHost/remove-src_filename

Browse source 
Remove src filename
This commit is contained in:
Alexandre Aubin 2021-04-17 01:57:41 +02:00 • committed by GitHub
commit 27c4b33065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/helpers.d/utils
View file

@ -201,6 +201,7 @@ ynh_setup_source () {
else else
unzip -quo $src_filename -d "$dest_dir" unzip -quo $src_filename -d "$dest_dir"
fi fi
ynh_secure_remove --file="$src_filename"
else else
local strip="" local strip=""
if [ "$src_in_subdir" != "false" ] if [ "$src_in_subdir" != "false" ]
@ -219,6 +220,7 @@ ynh_setup_source () {
else else
ynh_die --message="Archive format unrecognized." ynh_die --message="Archive format unrecognized."
fi fi
ynh_secure_remove --file="$src_filename"
fi fi
# Apply patches # Apply patches

6
src/yunohost/app.py
View file

@ -3605,7 +3605,11 @@ def _patch_legacy_helpers(app_folder):
if not os.path.isfile(filename): if not os.path.isfile(filename):
continue continue
content = read_file(filename) try:
content = read_file(filename)
except MoulinetteError:
continue
replaced_stuff = False replaced_stuff = False
show_warning = False show_warning = False