gronod/headphones
1
0
Fork 0
mirror of https://github.com/rembo10/headphones.git synced 2026-07-22 08:53:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes for github-branch-switching feature

Browse Source
This commit is contained in:
rembo10
2014-04-02 16:14:02 -07:00
parent 933dbd205c
commit 5da4cb7d12
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headphones/versioncheck.py
+4 -4
View File
@@ -74,13 +74,13 @@ def getVersion():
if not output: if not output:
logger.error('Couldn\'t find latest installed version.') logger.error('Couldn\'t find latest installed version.')
return None cur_commit_hash = None
cur_commit_hash = output.strip() cur_commit_hash = output.strip()
if not re.match('^[a-z0-9]+$', cur_commit_hash): if not re.match('^[a-z0-9]+$', cur_commit_hash):
logger.error('Output doesn\'t look like a hash, not using it') logger.error('Output doesn\'t look like a hash, not using it')
return None cur_commit_hash = None
if headphones.DO_NOT_OVERRIDE_GIT_BRANCH and headphones.GIT_BRANCH: if headphones.DO_NOT_OVERRIDE_GIT_BRANCH and headphones.GIT_BRANCH:
branch_name = headphones.GIT_BRANCH branch_name = headphones.GIT_BRANCH
@@ -105,7 +105,7 @@ def getVersion():
version_file = os.path.join(headphones.PROG_DIR, 'version.txt') version_file = os.path.join(headphones.PROG_DIR, 'version.txt')
if not os.path.isfile(version_file): if not os.path.isfile(version_file):
return None return None, 'master'
fp = open(version_file, 'r') fp = open(version_file, 'r')
current_version = fp.read().strip(' \n\r') current_version = fp.read().strip(' \n\r')
@@ -114,7 +114,7 @@ def getVersion():
if current_version: if current_version:
return current_version, headphones.GIT_BRANCH return current_version, headphones.GIT_BRANCH
else: else:
return None return None, 'master'
def checkGithub(): def checkGithub():