Commits (3)
......@@ -924,7 +924,7 @@ class ControlSession:
if self.debug:
warn("At %s, socket read begins\n" % time.asctime())
rawdata = polystr(self.sock.recv(4096))
rawdata = polybytes(self.sock.recv(4096))
if self.debug:
warn("Received %d octets\n" % len(rawdata))
rpkt = ControlPacket(self)
......
......@@ -126,9 +126,9 @@ def cmd_configure(ctx, config):
if exists(".git") and ctx.find_program("git", var="BIN_GIT", mandatory=False):
ctx.start_msg("DEVEL: Getting revision")
cmd = ["git", "log", "-1", "--format=%H"]
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=None)
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
ctx.env.NTPSEC_REVISION, stderr = p.communicate()
ctx.env.NTPSEC_REVISION = str(ctx.env.NTPSEC_REVISION).replace("\n", "")
ctx.env.NTPSEC_REVISION = ctx.env.NTPSEC_REVISION.replace("\n", "")
ctx.end_msg(ctx.env.NTPSEC_REVISION)
ctx.start_msg("Building version")
......