anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add git pull after checkout from interface

Browse Source
This commit is contained in:
JonnyWong16
2018-03-12 08:20:20 -07:00
parent 37afd141be
commit 8f8010884b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plexpy/versioncheck.py
View File

@@ -292,8 +292,8 @@ def update():
def checkout_git_branch():
if plexpy.INSTALL_TYPE == 'git':
output, err = runGit('fetch ' + plexpy.CONFIG.GIT_REMOTE)
output, err = runGit('checkout ' + plexpy.CONFIG.GIT_BRANCH)
output, err = runGit('fetch %s' % plexpy.CONFIG.GIT_REMOTE)
output, err = runGit('checkout %s' % plexpy.CONFIG.GIT_BRANCH)
if not output:
logger.error('Unable to change git branch.')
@@ -304,6 +304,8 @@ def checkout_git_branch():
logger.error('Unable to checkout from git: ' + line)
logger.info('Output: ' + str(output))
output, err = runGit('pull %s %s' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH))
def read_changelog(latest_only=False, since_prev_release=False):
changelog_file = os.path.join(plexpy.PROG_DIR, 'CHANGELOG.md')