Merge branch 'refs/heads/develop' into desktop

2012-05-15 23:15:17 +02:00
parent 978eeb16c9 edbeb02efb
commit b30a74ae0c
2 changed files with 2 additions and 2 deletions
--- a/couchpotato/core/_base/updater/main.py
+++ b/couchpotato/core/_base/updater/main.py
@@ -370,7 +370,7 @@ class DesktopUpdater(Plugin):
        try:
            latest = self.desktop._esky.find_update()

-            if latest != current_version.get('hash'):
+            if latest and latest != current_version.get('hash'):
                self.update_version = {
                    'hash': latest,
                    'date':  None,
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-VERSION = '2.0.0-pre1'
+VERSION = '2.0.0.pre1'