mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
remove some legacy pre-bullseye workarounds
This commit is contained in:
parent
0901298935
commit
8fb225f3ad
2 changed files with 2 additions and 20 deletions
|
@ -132,12 +132,8 @@ def main() -> bool:
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Only broadcast IPv4 because IPv6 is buggy ... because we ain't using python3-ifaddr >= 0.1.7
|
# Broadcast IPv4 and IPv6
|
||||||
# Buster only ships 0.1.6
|
ips: List[str] = interfaces[interface]["ipv4"] + interfaces[interface]["ipv6"]
|
||||||
# Bullseye ships 0.1.7
|
|
||||||
# To be re-enabled once we're on bullseye...
|
|
||||||
# ips: List[str] = interfaces[interface]["ipv4"] + interfaces[interface]["ipv6"]
|
|
||||||
ips: List[str] = interfaces[interface]["ipv4"]
|
|
||||||
|
|
||||||
# If at least one IP is listed
|
# If at least one IP is listed
|
||||||
if not ips:
|
if not ips:
|
||||||
|
|
14
src/app.py
14
src/app.py
|
@ -1999,20 +1999,6 @@ def _get_app_settings(app):
|
||||||
logger.error(m18n.n("app_not_correctly_installed", app=app))
|
logger.error(m18n.n("app_not_correctly_installed", app=app))
|
||||||
return {}
|
return {}
|
||||||
|
|
||||||
# Stupid fix for legacy bullshit
|
|
||||||
# In the past, some setups did not have proper normalization for app domain/path
|
|
||||||
# Meaning some setups (as of January 2021) still have path=/foobar/ (with a trailing slash)
|
|
||||||
# resulting in stupid issue unless apps using ynh_app_normalize_path_stuff
|
|
||||||
# So we yolofix the settings if such an issue is found >_>
|
|
||||||
# A simple call to `yunohost app list` (which happens quite often) should be enough
|
|
||||||
# to migrate all app settings ... so this can probably be removed once we're past Bullseye...
|
|
||||||
if settings.get("path") != "/" and (
|
|
||||||
settings.get("path", "").endswith("/")
|
|
||||||
or not settings.get("path", "/").startswith("/")
|
|
||||||
):
|
|
||||||
settings["path"] = "/" + settings["path"].strip("/")
|
|
||||||
_set_app_settings(app, settings)
|
|
||||||
|
|
||||||
# Make the app id available as $app too
|
# Make the app id available as $app too
|
||||||
settings["app"] = app
|
settings["app"] = app
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue