moparisthebest
/
SickRage
mirror of https://github.com/moparisthebest/SickRage
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for incorrectly displayed remote branch list when in advanced settings.

This commit is contained in:
echel0n 2014-07-27 13:00:53 -07:00
parent 7dc89c084f
commit a8bcbc66c3
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sickbeard/gh_api.py
View File

@ -90,11 +90,6 @@ class GitHub(object):
def branches(self):
access_API = self._access_API(
['repos', self.github_repo_user, self.github_repo, 'branches'])
return access_API
def checkout(self, branch):
access_API = self._access_API(
['repos', self.github_repo_user, self.github_repo, 'branches'])
return access_API
['repos', self.github_repo_user, self.github_repo, 'branches'],
params={'per_page': 100})
return access_API

4
sickbeard/versionChecker.py
View File

@ -528,9 +528,9 @@ class GitUpdateManager(UpdateManager):
return False
def list_remote_branches(self):
branches, err, exit_status = self._run_git(self._git_path, 'branch -r') # @UnusedVariable
branches, err, exit_status = self._run_git(self._git_path, 'ls-remote --heads origin') # @UnusedVariable
if exit_status == 0 and branches:
return branches.strip().replace('origin/', '').split()
return re.findall('\S+\Wrefs/heads/(.*)', branches)
return []
class SourceUpdateManager(UpdateManager):