[addons] sync with repo

5 files changed, 42 insertions, 17 deletions

diff --git a/addons/service.xbmc.versioncheck/addon.xml b/addons/service.xbmc.versioncheck/addon.xml
index 545722bc69..8f63c24e06 100644
--- a/addons/service.xbmc.versioncheck/addon.xml
+++ b/addons/service.xbmc.versioncheck/addon.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.xbmc.versioncheck"
        name="Version Check"
-      version="0.2.7"
+      version="0.3.2"
       provider-name="XBMC Foundation">
     <requires>
-        <import addon="xbmc.addon" version="12.0.0"/>
         <import addon="xbmc.python" version="2.1.0"/>
     </requires>
     <extension point="xbmc.service" library="service.py" start="login"/>
diff --git a/addons/service.xbmc.versioncheck/changelog.txt b/addons/service.xbmc.versioncheck/changelog.txt
index 0a038bbea3..b5f5c3a56a 100644
--- a/addons/service.xbmc.versioncheck/changelog.txt
+++ b/addons/service.xbmc.versioncheck/changelog.txt
@@ -1,3 +1,12 @@
+v0.3.2
+- Don't notify on newer unreleased builds
+
+v0.3.1
+- Don't notify on newer unreleased builds
+
+v0.3.0
+- Update with 14.0 Helix
+
 v0.2.7
 - Fix popup on Kodi 15.0 builds
 
diff --git a/addons/service.xbmc.versioncheck/lib/versions.py b/addons/service.xbmc.versioncheck/lib/versions.py
index 5b0f66c207..5ee95d505f 100644
--- a/addons/service.xbmc.versioncheck/lib/versions.py
+++ b/addons/service.xbmc.versioncheck/lib/versions.py
@@ -66,11 +66,13 @@ def compare_version(version_installed, versionlist):
         # check if you are using a RC build lower than current available RC
         # then check if you are using a beta/alpha lower than current available RC
         # 14.0rc3 is newer than:  14.0rc1, 14.0b9, 14.0a15
-        if version_installed.get('tagversion','') < versionlist_rc[0]['tagversion']:
-            version_available = versionlist_rc[0]
-            oldversion = True
-            log('Version available  %s' %versionlist_rc[0])
-            log('You are running an older RC version')
+        if version_installed['major'] <= int(versionlist_rc[0]['major']):
+            if version_installed['minor'] <= int(versionlist_rc[0]['minor']):
+                if version_installed.get('tagversion','') < versionlist_rc[0]['tagversion']:
+                    version_available = versionlist_rc[0]
+                    oldversion = True
+                    log('Version available  %s' %versionlist_rc[0])
+                    log('You are running an older RC version')
     # now check if installed !=rc
     elif not oldversion and version_installed['tag'] in ['beta','alpha','prealpha']:
         if version_installed['major'] <= int(versionlist_rc[0]['major']):
@@ -85,11 +87,13 @@ def compare_version(version_installed, versionlist):
         # check if you are using a RC build lower than current available RC
         # then check if you are using a beta/alpha lower than current available RC
         # 14.0b3 is newer than:  14.0b1, 14.0a15
-        if version_installed.get('tagversion','') < versionlist_beta[0]['tagversion']:
-            version_available = versionlist_beta[0]
-            oldversion = True
-            log('Version available  %s' %versionlist_beta[0])
-            log('You are running an older beta version')
+        if version_installed['major'] <= int(versionlist_beta[0]['major']):
+            if version_installed['minor'] <= int(versionlist_beta[0]['minor']):
+                if version_installed.get('tagversion','') < versionlist_beta[0]['tagversion']:
+                    version_available = versionlist_beta[0]
+                    oldversion = True
+                    log('Version available  %s' %versionlist_beta[0])
+                    log('You are running an older beta version')
     # now check if installed !=beta
     elif not oldversion and version_installed['tag'] in ['alpha','prealpha']:
         if version_installed['major'] <= int(versionlist_beta[0]['major']):
@@ -105,11 +109,12 @@ def compare_version(version_installed, versionlist):
         # then check if you are using a beta/alpha lower than current available RC
         # 14.0a3 is newer than: 14.0a1 or pre-alpha
         if version_installed['major'] <= int(versionlist_alpha[0]['major']):
-            if version_installed.get('tagversion','') < versionlist_alpha[0]['tagversion']:
-                version_available = versionlist_alpha[0]
-                oldversion = True
-                log('Version available  %s' %versionlist_alpha[0])
-                log('You are running an older alpha version')
+            if version_installed['minor'] <= int(versionlist_alpha[0]['minor']):
+                if version_installed.get('tagversion','') < versionlist_alpha[0]['tagversion']:
+                    version_available = versionlist_alpha[0]
+                    oldversion = True
+                    log('Version available  %s' %versionlist_alpha[0])
+                    log('You are running an older alpha version')
     # now check if installed !=alpha
     elif not oldversion and version_installed['tag'] in ['prealpha']:
         if version_installed['major'] <= int(versionlist_alpha[0]['major']):
diff --git a/addons/service.xbmc.versioncheck/resources/versions.txt b/addons/service.xbmc.versioncheck/resources/versions.txt
index aea69cc9c7..73e2f1ca90 100644
--- a/addons/service.xbmc.versioncheck/resources/versions.txt
+++ b/addons/service.xbmc.versioncheck/resources/versions.txt
@@ -3,6 +3,15 @@
     "releases": {
         "stable": [
             {
+                "major": "14",
+                "minor": "0",
+                "tag": "stable",
+                "tagversion":"",
+                "revision": "20141223-ad747d9",
+                "extrainfo": "final",
+                "addon_support": "yes"
+            },
+            {
                 "major": "13",
                 "minor": "2",
                 "tag": "stable",
diff --git a/addons/service.xbmc.versioncheck/service.py b/addons/service.xbmc.versioncheck/service.py
index 69e7a68b5d..97a4f3238c 100644
--- a/addons/service.xbmc.versioncheck/service.py
+++ b/addons/service.xbmc.versioncheck/service.py
@@ -39,6 +39,9 @@ class Main:
         if xbmc.getCondVisibility('System.Platform.Linux') and __addon__.getSetting("upgrade_apt") == 'true':
             packages = ['xbmc']
             _versionchecklinux(packages)
+        # temporary don't notify Windows untill crashing has been solved
+        elif xbmc.getCondVisibility('System.Platform.Windows'):
+            pass
         else:
             oldversion, version_installed, version_available, version_stable = _versioncheck()
             if oldversion: