makebuildserver: buildserverid should always be a string

diff --git a/makebuildserver b/makebuildserver
index 48e0f197ec100d8adc2cd81cc74e2ae90b0443b0..537e6e7da9fda3f6f1a617ff8124a646a0120316 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -456,7 +456,8 @@ if returncode != 0:
     sys.exit(1)
 
 print("Writing buildserver ID")
-p = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE)
+p = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE,
+                     universal_newlines=True)
 buildserverid = p.communicate()[0].strip()
 print("...ID is " + buildserverid)
 subprocess.call(