diff --git a/pypcc/pypcc.py b/pypcc/pypcc.py index 1e121cad119363e3d9e633512116fd602fdb0f28..45b48e0b93308ed6097f8cf4ac738a4fcf24d9a5 100755 --- a/pypcc/pypcc.py +++ b/pypcc/pypcc.py @@ -68,7 +68,7 @@ configs=[] if not(args.test): handler=opcuaserv.InitServer(port=args.port) logging.info("Load OPCUA variables & start i2c listing thread") - opcuaserv.AddVarR("pypcc_git_hash",git_hash,[],False) + opcuaserv.AddVarR("TR_software_version_R",git_hash,[],False) for i,name in enumerate(I2Cports): RCU_I2C=I2Cclients[i] RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=name) diff --git a/setup.py b/setup.py index 16a86eba70e3e6396395cf7287db5637d6549b8c..bb1e0017b0fdfb8cee891f8d0c2851f36e9cada7 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,8 @@ import subprocess def _get_version_hash(): """Talk to git and find out the tag/hash of our latest commit""" try: - p = subprocess.Popen(["git", "rev-parse","HEAD"], +# p = subprocess.Popen(["git", "rev-parse","HEAD"], + p = subprocess.Popen(["git", "show","-s","--format=%ci"], # p = subprocess.Popen(["git", "log","-1","--format='%H'"], stdout=subprocess.PIPE) except EnvironmentError: