Possible fix for updating when using zips from github

sickbeard/__init__.py

@@ -444,7 +444,7 @@ __INITIALIZED__ = False
 def initialize(consoleLogging=True):
     with INIT_LOCK:
 
-        global BRANCH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
+        global BRANCH, CUR_COMMIT_HASH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
             HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \
             SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \
             NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \
@@ -514,6 +514,9 @@ def initialize(consoleLogging=True):
         # branch
         BRANCH = check_setting_str(CFG, 'General', 'branch', '')
 
+        # current commit hash
+        CUR_COMMIT_HASH = check_setting_str(CFG, 'General', 'cur_commit_hash', '')
+
         ACTUAL_CACHE_DIR = check_setting_str(CFG, 'General', 'cache_dir', 'cache')
         # fix bad configs due to buggy code
         if ACTUAL_CACHE_DIR == 'None':
@@ -1306,6 +1309,7 @@ def save_config():
     # For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config()
     new_config['General'] = {}
     new_config['General']['branch'] = BRANCH
+    new_config['General']['cur_commit_hash'] = CUR_COMMIT_HASH
     new_config['General']['config_version'] = CONFIG_VERSION
     new_config['General']['encryption_version'] = int(ENCRYPTION_VERSION)
     new_config['General']['log_dir'] = ACTUAL_LOG_DIR if ACTUAL_LOG_DIR else 'Logs'

sickbeard/versionChecker.py

@@ -566,17 +566,9 @@ class SourceUpdateManager(UpdateManager):
         if sickbeard.BRANCH == '':
             self.branch = self._find_installed_branch()
 
-        self._cur_commit_hash = None
+        self._cur_commit_hash = sickbeard.CUR_COMMIT_HASH
         self._newest_commit_hash = None
         self._num_commits_behind = 0
-        
-    def _find_installed_version(self):
-        installed_path = os.path.dirname(os.path.normpath(os.path.abspath(__file__)))
-        self._cur_commit_hash = self.hash_dir(installed_path)
-
-        if not self._cur_commit_hash:
-            self._cur_commit_hash = None
-        sickbeard.CUR_COMMIT_HASH = str(self._cur_commit_hash)
 
     def _find_installed_branch(self):
         if sickbeard.BRANCH == "":
@@ -590,8 +582,6 @@ class SourceUpdateManager(UpdateManager):
             logger.log(u"Branch checkout: " + self._find_installed_branch() + "->" + self.branch, logger.DEBUG)
             return True
 
-        self._find_installed_version()
-
         try:
             self._check_github_for_update()
         except Exception, e:
@@ -746,6 +736,9 @@ class SourceUpdateManager(UpdateManager):
                     if os.path.isfile(new_path):
                         os.remove(new_path)
                     os.renames(old_path, new_path)
+
+            sickbeard.CUR_COMMIT_HASH = self._newest_commit_hash
+            
         except Exception, e:
             logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
             logger.log(u"Traceback: " + traceback.format_exc(), logger.DEBUG)