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

Fixes following rebase

Browse source
This commit is contained in:
Alexandre Aubin 2018-12-12 13:23:53 +00:00
parent 2dd1d8ccfe
commit e97b07403f
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/yunohost/data_migrations/0007_ssh_conf_managed_by_yunohost_step1.py
View file

@ -4,7 +4,6 @@ import re
from shutil import copyfile from shutil import copyfile
from moulinette import m18n from moulinette import m18n
from moulinette.core import MoulinetteError
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
@ -12,6 +11,7 @@ from yunohost.tools import Migration
from yunohost.service import service_regen_conf, _get_conf_hashes, \ from yunohost.service import service_regen_conf, _get_conf_hashes, \
_calculate_hash, _run_service_command _calculate_hash, _run_service_command
from yunohost.settings import settings_set from yunohost.settings import settings_set
from yunohost.utils.error import YunohostError
logger = getActionLogger('yunohost.migration') logger = getActionLogger('yunohost.migration')
@ -67,11 +67,11 @@ class MyMigration(Migration):
# Restart ssh and backward if it fail # Restart ssh and backward if it fail
if not _run_service_command('restart', 'ssh'): if not _run_service_command('restart', 'ssh'):
self.backward() self.backward()
raise MoulinetteError(m18n.n("migration_0007_cancel")) raise YunohostError("migration_0007_cancel")
def backward(self): def backward(self):
# We don't backward completely but it should be enough # We don't backward completely but it should be enough
copyfile('/etc/ssh/sshd_config.bkp', SSHD_CONF) copyfile('/etc/ssh/sshd_config.bkp', SSHD_CONF)
if not _run_service_command('restart', 'ssh'): if not _run_service_command('restart', 'ssh'):
raise MoulinetteError(m18n.n("migration_0007_cannot_restart")) raise YunohostError("migration_0007_cannot_restart")

5
src/yunohost/data_migrations/0008_ssh_conf_managed_by_yunohost_step2.py
View file

@ -1,13 +1,12 @@
import re import re
from moulinette import m18n
from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from yunohost.tools import Migration from yunohost.tools import Migration
from yunohost.service import service_regen_conf, _get_conf_hashes, \ from yunohost.service import service_regen_conf, _get_conf_hashes, \
_calculate_hash _calculate_hash
from yunohost.settings import settings_set, settings_get from yunohost.settings import settings_set, settings_get
from yunohost.utils.error import YunohostError
logger = getActionLogger('yunohost.migration') logger = getActionLogger('yunohost.migration')
@ -33,7 +32,7 @@ class MyMigration(Migration):
def backward(self): def backward(self):
raise MoulinetteError(m18n.n("migration_0008_backward_impossible")) raise YunohostError("migration_0008_backward_impossible")
@property @property
def mode(self): def mode(self):