Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hotfix - fix docs get_git_branch

Browse Source
This commit is contained in:
bunkerity 2021-06-15 17:10:34 +02:00
parent d62c4f466d
commit 15bdb076c8
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/conf.py
View File

@ -14,7 +14,7 @@
# import sys # import sys
# sys.path.insert(0, os.path.abspath('.')) # sys.path.insert(0, os.path.abspath('.'))
import os import os, subprocess, re
def get_git_branch(): def get_git_branch():
"""Get the git branch this repository is currently on""" """Get the git branch this repository is currently on"""
@ -26,7 +26,7 @@ def get_git_branch():
# This will contain something like "* (HEAD detached at origin/MYBRANCH)" # This will contain something like "* (HEAD detached at origin/MYBRANCH)"
# or something like "* MYBRANCH" # or something like "* MYBRANCH"
branch_output = p.communicate()[0] branch_output = p.communicate()[0].decode("ascii")
# This is if git is in a normal branch state # This is if git is in a normal branch state
match = re.search(r'\* (?P<branch_name>[^\(\)\n ]+)', branch_output) match = re.search(r'\* (?P<branch_name>[^\(\)\n ]+)', branch_output)
@ -37,20 +37,20 @@ def get_git_branch():
match = re.search(r'\(HEAD detached at origin/(?P<branch_name>[^\)]+)\)', branch_output) match = re.search(r'\(HEAD detached at origin/(?P<branch_name>[^\)]+)\)', branch_output)
if match: if match:
return match.groupdict()['branch_name'] return match.groupdict()['branch_name']
except Exception: except Exception as e :
print(e)
print(u'Could not get the branch') print(u'Could not get the branch')
# Couldn't figure out the branch probably due to an error # Couldn't figure out the branch probably due to an error
return None return None
# -- Project information ----------------------------------------------------- # -- Project information -----------------------------------------------------
project = 'bunkerized-nginx' project = 'bunkerized-nginx'
copyright = '2021, bunkerity' copyright = '2021, bunkerity'
author = 'bunkerity' author = 'bunkerity'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = 'v1.2.6' release = 'v1.2.7'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------