From 35c035673418bfcca05e0f8ce668fecfdec2c2a9 Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 27 Oct 2012 18:25:27 +0200 Subject: [PATCH] Let esky manage it's own restart --- couchpotato/core/_base/updater/main.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/couchpotato/core/_base/updater/main.py b/couchpotato/core/_base/updater/main.py index dab8077..c5a748f 100644 --- a/couchpotato/core/_base/updater/main.py +++ b/couchpotato/core/_base/updater/main.py @@ -8,9 +8,11 @@ from couchpotato.environment import Env from datetime import datetime from dateutil.parser import parse from git.repository import LocalRepository +import atexit import json import os import shutil +import sys import tarfile import time import traceback @@ -106,6 +108,10 @@ class Updater(Plugin): if success: fireEventAsync('app.restart') + # Assume the updater handles things + if not success: + success = True + return jsonified({ 'success': success }) @@ -396,6 +402,7 @@ class DesktopUpdater(BaseUpdater): self.update_failed = True self.desktop._esky.auto_update(callback = do_restart) + return except: self.update_failed = True