mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Use lsb_release instead of platform to check debian version during migration
This commit is contained in:
parent
e8f97e7b3e
commit
4f9901c861
1 changed files with 5 additions and 2 deletions
|
@ -5,7 +5,6 @@ import base64
|
||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
import errno
|
import errno
|
||||||
import platform
|
|
||||||
from shutil import copy2
|
from shutil import copy2
|
||||||
|
|
||||||
from moulinette import m18n, msettings
|
from moulinette import m18n, msettings
|
||||||
|
@ -80,7 +79,11 @@ class MyMigration(Migration):
|
||||||
self.upgrade_yunohost_packages()
|
self.upgrade_yunohost_packages()
|
||||||
|
|
||||||
def debian_major_version(self):
|
def debian_major_version(self):
|
||||||
return int(platform.dist()[1][0])
|
# We rely on lsb_release instead of the python module "platform",
|
||||||
|
# because "platform" relies on uname, which on some weird setups does
|
||||||
|
# not behave correctly (still says running Jessie when lsb_release says
|
||||||
|
# Stretch...)
|
||||||
|
return int(check_output("lsb_release -r").split("\t")[1][0])
|
||||||
|
|
||||||
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])
|
||||||
|
|
Loading…
Add table
Reference in a new issue