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

Revert "Rely on the codename instead of release number because lsb_release is fokin stupid"

Browse source 
This reverts commit f96aa44505.
This commit is contained in:
Alexandre Aubin 2018-06-12 00:29:30 +02:00
parent f96aa44505
commit 201edd8c38
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/yunohost/data_migrations/0003_migrate_to_stretch.py
View file

@ -55,7 +55,7 @@ class MyMigration(Migration):
_run_service_command("stop", "mysql") _run_service_command("stop", "mysql")
self.apt_dist_upgrade(conf_flags=["old", "miss", "def"]) self.apt_dist_upgrade(conf_flags=["old", "miss", "def"])
_run_service_command("start", "mysql") _run_service_command("start", "mysql")
if self.debian_major_version() == "jessie": if self.debian_major_version() == 8:
raise MoulinetteError(m18n.n("migration_0003_still_on_jessie_after_main_upgrade", log=self.logfile)) raise MoulinetteError(m18n.n("migration_0003_still_on_jessie_after_main_upgrade", log=self.logfile))
# Specific upgrade for fail2ban... # Specific upgrade for fail2ban...
@ -89,10 +89,7 @@ class MyMigration(Migration):
# because "platform" relies on uname, which on some weird setups does # because "platform" relies on uname, which on some weird setups does
# not behave correctly (still says running Jessie when lsb_release says # not behave correctly (still says running Jessie when lsb_release says
# Stretch...) # Stretch...)
# Also lsb_release is fucking stupid and sometimes return "Release: 8" return int(check_output("lsb_release -r").split("\t")[1][0])
# and "Codename: stretch". So apparently the codename is more reliable
# than the release number :|
return check_output("lsb_release -c").split("\t")[1].strip()
def yunohost_major_version(self): def yunohost_major_version(self):
return int(get_installed_version("yunohost").split('.')[0]) return int(get_installed_version("yunohost").split('.')[0])
@ -103,7 +100,7 @@ class MyMigration(Migration):
# NB : we do both check to cover situations where the upgrade crashed # NB : we do both check to cover situations where the upgrade crashed
# in the middle and debian version could be >= 9.x but yunohost package # in the middle and debian version could be >= 9.x but yunohost package
# would still be in 2.x... # would still be in 2.x...
if not self.debian_major_version() == "jessie" \ if not self.debian_major_version() == 8 \
and not self.yunohost_major_version() == 2: and not self.yunohost_major_version() == 2:
raise MoulinetteError(m18n.n("migration_0003_not_jessie")) raise MoulinetteError(m18n.n("migration_0003_not_jessie"))
@ -128,7 +125,7 @@ class MyMigration(Migration):
# NB : we do both check to cover situations where the upgrade crashed # NB : we do both check to cover situations where the upgrade crashed
# in the middle and debian version could be >= 9.x but yunohost package # in the middle and debian version could be >= 9.x but yunohost package
# would still be in 2.x... # would still be in 2.x...
if not self.debian_major_version() == "jessie" \ if not self.debian_major_version() == 8 \
and not self.yunohost_major_version() == 2: and not self.yunohost_major_version() == 2:
return None return None