catdog2/pelican-deployment-system
1
0
Fork 0
mirror of https://github.com/IEEE-SB-Passau/pelican-deployment-system.git synced 2017-09-06 16:35:38 +02:00
Code Activity

universal_newlines are good

Browse Source
This commit is contained in:
Peter Dahlberg
2016-06-12 22:54:46 +02:00
parent 8a36824530
commit 6698a51302
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pelican_deploy/deploy.py
View File

@@ -121,7 +121,7 @@ class DeploymentRunner:
def final_install(self): def final_install(self):
args = shlex.split(self.final_install_command) args = shlex.split(self.final_install_command)
log.info("%s: Starting final_install `%s`", self.name, args) log.info("%s: Starting final_install `%s`", self.name, args)
proc = Popen(args, stdout=PIPE, stderr=PIPE) proc = Popen(args, stdout=PIPE, stderr=PIPE, universal_newlines=True)
atexit.register(proc.kill) atexit.register(proc.kill)
outs, errs = proc.communicate() outs, errs = proc.communicate()
status = proc.wait() status = proc.wait()
@@ -130,14 +130,10 @@ class DeploymentRunner:
if status < 0: if status < 0:
log.info("%s: killed final_install_command (%s)", self.name, status) log.info("%s: killed final_install_command (%s)", self.name, status)
else: else:
log.info('%s final_install_command stdout: %s\n', self.name,
outs.decode(encoding=sys.getdefaultencoding(),
errors='replace'))
log.info('%s final_install_command stderr: %s\n', self.name,
errs.decode(encoding=sys.getdefaultencoding(),
errors='replace'))
log.info("%s: finished final_install_command with status %s!", log.info("%s: finished final_install_command with status %s!",
self.name, status) self.name, status)
log.info('%s final_install_command stdout: %s\n', self.name, outs)
log.info('%s final_install_command stderr: %s\n', self.name, errs)
if status > 0: if status > 0:
log.error("%s: final_install failed! Website may be broken!", log.error("%s: final_install failed! Website may be broken!",
@@ -156,7 +152,8 @@ class DeploymentRunner:
log.info("%s: Starting build_command `%s`", self.name, args) log.info("%s: Starting build_command `%s`", self.name, args)
self._build_proc = Popen(args, stdout=PIPE, stderr=PIPE, self._build_proc = Popen(args, stdout=PIPE, stderr=PIPE,
cwd=str(self.build_repo_path), cwd=str(self.build_repo_path),
env=self._build_proc_env) env=self._build_proc_env,
universal_newlines=True)
atexit.register(self._build_proc.kill) atexit.register(self._build_proc.kill)
outs, errs = self._build_proc.communicate() outs, errs = self._build_proc.communicate()
status = self._build_proc.wait() status = self._build_proc.wait()
@@ -165,13 +162,9 @@ class DeploymentRunner:
if status < 0: if status < 0:
log.info("%s: killed build_command", self.name) log.info("%s: killed build_command", self.name)
else: else:
log.info('%s build_command stdout: %s\n', self.name,
outs.decode(encoding=sys.getdefaultencoding(),
errors='replace'))
log.info('%s build_command stderr: %s\n', self.name,
errs.decode(encoding=sys.getdefaultencoding(),
errors='replace'))
log.info("%s: finished build_command with status %s!", log.info("%s: finished build_command with status %s!",
self.name, status) self.name, status)
log.info('%s build_command stdout: %s\n', self.name, outs)
log.info('%s build_command stderr: %s\n', self.name, errs)
if status == 0: if status == 0:
self.final_install() self.final_install()