Update yunohost_tools.py

This commit is contained in:
abeudin 2014-03-13 12:37:51 +01:00
parent a2e02c56cf
commit 8fbfb57ffb

View file

@ -276,6 +276,7 @@ def tools_update():
else: else:
return { "Update" : stdout.splitlines() } return { "Update" : stdout.splitlines() }
def tools_changelog(): def tools_changelog():
""" """
Show Changelog Show Changelog
@ -288,6 +289,7 @@ def tools_changelog():
else: else:
raise YunoHostError(17, _("Launch update before upgrade")) raise YunoHostError(17, _("Launch update before upgrade"))
def tools_upgrade(): def tools_upgrade():
""" """
Upgrade distribution Upgrade distribution
@ -296,8 +298,7 @@ def tools_upgrade():
if os.path.isfile('/tmp/yunohost/upgrade.run'): if os.path.isfile('/tmp/yunohost/upgrade.run'):
win_msg( _("Upgrade in progress")) win_msg( _("Upgrade in progress"))
else: else:
if os.path.isfile('/tmp/yunohost/update_status'): if os.path.isfile('/tmp/yunohost/upgrade_status'):
os.system('at now -f /etc/yunohost/upgrade')
with open('/tmp/yunohost/upgrade_status', 'r') as f: with open('/tmp/yunohost/upgrade_status', 'r') as f:
read_data = f.read() read_data = f.read()
os.system('rm /tmp/yunohost/upgrade_status') os.system('rm /tmp/yunohost/upgrade_status')
@ -305,5 +306,8 @@ def tools_upgrade():
win_msg( _("YunoHost has been successfully upgraded")) win_msg( _("YunoHost has been successfully upgraded"))
else: else:
raise YunoHostError(17, _("Error during upgrade")) raise YunoHostError(17, _("Error during upgrade"))
elif os.path.isfile('/tmp/yunohost/update_status'):
os.system('at now -f /etc/yunohost/upgrade')
win_msg( _("Upgrade in progress"))
else: else:
raise YunoHostError(17, _("Launch update before upgrade")) raise YunoHostError(17, _("Launch update before upgrade"))