From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 14 Mar 2016 16:33:06 +0000 (+0100)
Subject: makebuildserver: buildserverid should always be a string
X-Git-Tag: 0.7.0~80^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8f9940006421437c68ea62f6c477077b20427a71;p=fdroidserver.git

makebuildserver: buildserverid should always be a string
---

diff --git a/makebuildserver b/makebuildserver
index 48e0f197..537e6e7d 100755
--- 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(