Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add git support to get revision

pull/48/head
Nicolas Bessi 2014-09-09 14:12:19 +02:00
parent 1563582d03
commit 0771efa10a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server_environment/system_info.py
View File

@ -37,9 +37,12 @@ def _get_output(cmd):
def get_server_environment(): def get_server_environment():
# inspired by server/bin/service/web_services.py # inspired by server/bin/service/web_services.py
try: try:
rev_id = _get_output('bzr revision-info') rev_id = 'git:%s' % _get_output('git rev-parse HEAD')
except Exception as e: except Exception:
rev_id = 'Exception: %s' % (e,) try:
rev_id = 'bzr: %s' % _get_output('bzr revision-info')
except Exception:
rev_id = 'Can not retrive revison from git or bzr'
os_lang = '.'.join([x for x in locale.getdefaultlocale() if x]) os_lang = '.'.join([x for x in locale.getdefaultlocale() if x])
if not os_lang: if not os_lang:
@ -50,7 +53,7 @@ def get_server_environment():
lsbinfo = 'not lsb compliant' lsbinfo = 'not lsb compliant'
return ( return (
('platform', platform.platform()), ('platform', platform.platform()),
('os.name', os.name), ('os name', os.name),
('lsb_release', lsbinfo), ('lsb_release', lsbinfo),
('release', platform.release()), ('release', platform.release()),
('version', platform.version()), ('version', platform.version()),