Merge branch 'refs/heads/develop' into desktop

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