monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-18 08:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into dev

Browse source
This commit is contained in:
JackDandy 2024-02-13 11:13:45 +00:00
commit 41e136fca1
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -24,6 +24,11 @@
* Fix media process being ignored by Plex extras
### 3.30.10 (2024-02-13 11:00:00 UTC)
* Change prevent git update issue
### 3.30.9 (2024-02-07 23:10:00 UTC)
* Change allow Python 3.12.2

5
sickgear/version_checker.py
View file

@ -601,9 +601,10 @@ class GitUpdateManager(UpdateManager):
if self.branch == self._find_installed_branch():
if not self._cur_pr_number:
_, _, exit_status = self._run_git(['pull', '-f', '%s' % sickgear.GIT_REMOTE, '%s' % self.branch])
_, _, exit_status = self._run_git(['pull', '-f', '--no-rebase', '%s' % sickgear.GIT_REMOTE,
'%s' % self.branch])
else:
_, _, exit_status = self._run_git(['pull', '-f', '%s' % sickgear.GIT_REMOTE,
_, _, exit_status = self._run_git(['pull', '-f', '--no-rebase', '%s' % sickgear.GIT_REMOTE,
'pull/%s/head:%s' % (self._cur_pr_number, self.branch)])
else: