diff options
Diffstat (limited to 'addons/service.xbmc.versioncheck/service.py')
| -rw-r--r-- | addons/service.xbmc.versioncheck/service.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/addons/service.xbmc.versioncheck/service.py b/addons/service.xbmc.versioncheck/service.py index a96c81a975..69e7a68b5d 100644 --- a/addons/service.xbmc.versioncheck/service.py +++ b/addons/service.xbmc.versioncheck/service.py @@ -22,6 +22,7 @@ import xbmc import lib.common from lib.common import log, dialog_yesno from lib.common import upgrade_message as _upgrademessage +from lib.common import upgrade_message2 as _upgrademessage2 __addon__ = lib.common.__addon__ __addonversion__ = lib.common.__addonversion__ @@ -34,20 +35,14 @@ class Main: def __init__(self): linux = False packages = [] - if not xbmc.getCondVisibility('System.HasAddon(os.openelec.tv)'): - if not sys.argv[0]: - xbmc.executebuiltin('XBMC.AlarmClock(CheckAtBoot,XBMC.RunScript(service.xbmc.versioncheck, started),00:00:30,silent)') - xbmc.executebuiltin('XBMC.AlarmClock(CheckWhileRunning,XBMC.RunScript(service.xbmc.versioncheck, started),24:00:00,silent,loop)') - elif sys.argv[0] and sys.argv[1] == 'started': - if xbmc.getCondVisibility('System.Platform.Linux') and __addon__.getSetting("upgrade_apt") == 'true': - packages = ['xbmc'] - _versionchecklinux(packages) - else: - oldversion, msg = _versioncheck() - if oldversion: - _upgrademessage(msg, oldversion, False) - else: - pass + xbmc.sleep(5000) + if xbmc.getCondVisibility('System.Platform.Linux') and __addon__.getSetting("upgrade_apt") == 'true': + packages = ['xbmc'] + _versionchecklinux(packages) + else: + oldversion, version_installed, version_available, version_stable = _versioncheck() + if oldversion: + _upgrademessage2( version_installed, version_available, version_stable, oldversion, False) def _versioncheck(): # initial vars @@ -58,8 +53,8 @@ def _versioncheck(): # retrieve version installed version_installed = get_installedversion() # copmpare installed and available - oldversion, msg = compare_version(version_installed, versionlist) - return oldversion, msg + oldversion, version_installed, version_available, version_stable = compare_version(version_installed, versionlist) + return oldversion, version_installed, version_available, version_stable def _versionchecklinux(packages): |