Merge branch 'refs/heads/develop'

2012-05-14 23:36:53 +02:00
parent cb975f6180 176f4b06d0
commit 577aed3a75
2 changed files with 7 additions and 2 deletions
--- a/couchpotato/core/_base/updater/main.py
+++ b/couchpotato/core/_base/updater/main.py
@@ -360,8 +360,12 @@ class DesktopUpdater(Plugin):
        }

    def check(self):
-        pass
+        self.desktop.CheckForUpdate(silentUnlessUpdate = True)

    def getVersion(self):
-        return {}
+        return {
+            'hash': self.desktop._esky.active_version,
+            'data': None,
+            'type': 'desktop',
+        }

--- a/version.py
+++ b/version.py
@@ -0,0 +1 @@
+VERSION = '2.0.0-pre1'