diff --git a/debian/changelog b/debian/changelog index 4b8c26471..1d13b6290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +yunohost (3.6.5.2) stable; urgency=low + + - [fix] Alex was drunk and released an epic stupid bug in stable (2623d385) + + -- Alexandre Aubin Thu, 10 Oct 2019 01:00:00 +0000 + +yunohost (3.6.5.1) stable; urgency=low + + - [mod] Change maxretry of fail2ban from 6 to 10 (fe8fd1b) + + -- Alexandre Aubin Tue, 08 Oct 2019 20:00:00 +0000 + yunohost (3.6.5) stable; urgency=low - [enh] Detect and warn early about unavailable full domains... (#798) @@ -5,7 +17,7 @@ yunohost (3.6.5) stable; urgency=low - [fix] Epicly ugly workaround for the goddamn dependency nighmare about sury fucking up php7.0 dependencies (#809) - [fix] Support logfiles not ending with .log in logrotate ... (#810) - -- Alexandre Aubin Mon, 08 Oct 2019 19:00:00 +0000 + -- Alexandre Aubin Tue, 08 Oct 2019 19:00:00 +0000 yunohost (3.6.4.6) stable; urgency=low diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 7235535cd..eb970b68f 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -2839,9 +2839,8 @@ def _validate_and_normalize_webpath(manifest, args_dict, app_folder): and re.search(r"(ynh_webpath_register|yunohost app checkurl)", install_script_content): domain = domain_args[0][1] - conflicts = _get_conflicting_apps(domain, "/") - - raise YunohostError('app_full_domain_unavailable', domain=domain) + if _get_conflicting_apps(domain, "/"): + raise YunohostError('app_full_domain_unavailable', domain=domain) def _make_environment_dict(args_dict, prefix="APP_ARG_"):