Merge branch 'master' of https://git.astron.nl/lofar2.0/pypcc

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)

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: