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

Add release to reset git install log message

Browse Source
This commit is contained in:
JonnyWong16
2020-03-08 13:36:29 -07:00
parent 5661c00497
commit 595bff94b4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plexpy/versioncheck.py
View File

@@ -330,7 +330,10 @@ def update():
def reset_git_install(): def reset_git_install():
if plexpy.INSTALL_TYPE == 'git': if plexpy.INSTALL_TYPE == 'git':
logger.info('Attempting to reset git install to "%s/%s"' % (plexpy.CONFIG.GIT_REMOTE, plexpy.CONFIG.GIT_BRANCH)) logger.info('Attempting to reset git install to "{}/{}/{}"'.format(plexpy.CONFIG.GIT_REMOTE,
plexpy.CONFIG.GIT_BRANCH,
common.RELEASE))
output, err = runGit('remote set-url {} https://github.com/{}/{}.git'.format(plexpy.CONFIG.GIT_REMOTE, output, err = runGit('remote set-url {} https://github.com/{}/{}.git'.format(plexpy.CONFIG.GIT_REMOTE,
plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_USER,
plexpy.CONFIG.GIT_REPO)) plexpy.CONFIG.GIT_REPO))
@@ -355,8 +358,11 @@ def reset_git_install():
def checkout_git_branch(): def checkout_git_branch():
if plexpy.INSTALL_TYPE == 'git': if plexpy.INSTALL_TYPE == 'git':
output, err = runGit('fetch %s' % plexpy.CONFIG.GIT_REMOTE) logger.info('Attempting to checkout git branch "{}/{}"'.format(plexpy.CONFIG.GIT_REMOTE,
output, err = runGit('checkout %s' % plexpy.CONFIG.GIT_BRANCH) plexpy.CONFIG.GIT_BRANCH))
output, err = runGit('fetch {}'.format(plexpy.CONFIG.GIT_REMOTE))
output, err = runGit('checkout {}'.format(plexpy.CONFIG.GIT_BRANCH))
if not output: if not output:
logger.error('Unable to change git branch.') logger.error('Unable to change git branch.')