Fix imports in some migrations

This commit is contained in:
Alexandre Aubin 2019-02-18 19:10:01 +01:00
parent 0ebbb83191
commit d7d2242862
3 changed files with 6 additions and 10 deletions

View file

@ -10,8 +10,8 @@ from moulinette.utils.filesystem import read_file
from yunohost.tools import Migration from yunohost.tools import Migration
from yunohost.app import unstable_apps from yunohost.app import unstable_apps
from yunohost.service import (_run_service_command, from yunohost.service import _run_service_command
manually_modified_files, from yunohost.regenconf import (manually_modified_files,
manually_modified_files_compared_to_debian_default) manually_modified_files_compared_to_debian_default)
from yunohost.utils.filesystem import free_space_in_directory from yunohost.utils.filesystem import free_space_in_directory
from yunohost.utils.packages import get_installed_version from yunohost.utils.packages import get_installed_version

View file

@ -3,15 +3,12 @@ import re
from shutil import copyfile from shutil import copyfile
from moulinette import m18n
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import mkdir, rm from moulinette.utils.filesystem import mkdir, rm
from yunohost.tools import Migration from yunohost.tools import Migration
from yunohost.service import _get_conf_hashes, \ from yunohost.service import _run_service_command
_calculate_hash, \ from yunohost.regenconf import regen_conf
_run_service_command
from yunohost.regen_conf import regen_conf
from yunohost.settings import settings_set from yunohost.settings import settings_set
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError

View file

@ -6,8 +6,7 @@ from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import chown from moulinette.utils.filesystem import chown
from yunohost.tools import Migration from yunohost.tools import Migration
from yunohost.service import _get_conf_hashes, \ from yunohost.regenconf import _get_conf_hashes, _calculate_hash
_calculate_hash
from yunohost.regenconf import regen_conf from yunohost.regenconf import regen_conf
from yunohost.settings import settings_set, settings_get from yunohost.settings import settings_set, settings_get
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError