Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit e0781e755c84834495b1596788b18a96979ebb3f
Author: Valentin Gologuzov <vgologuz(a)redhat.com>
Date: Thu Jan 15 13:37:03 2015 +0100
[backend] builder: use only one log file for rsync per build
---------------------------------------------------------------
backend/backend/mockremote/__init__.py | 5 ++---
backend/backend/mockremote/builder.py | 8 +++-----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/backend/backend/mockremote/__init__.py
b/backend/backend/mockremote/__init__.py
index f23ee15..c835910 100755
--- a/backend/backend/mockremote/__init__.py
+++ b/backend/backend/mockremote/__init__.py
@@ -317,8 +317,7 @@ class MockRemote(object):
# downloading
self.callback.start_download(self.pkg)
- download_stdout = self.builder.download(self.pkg, self.chroot_dir)
- self.callback.log("builder.download output
{}".format(download_stdout))
+ self.builder.download(self.pkg, self.chroot_dir)
self.callback.end_download(self.pkg)
# add record to mockchain.log # TODO:
@@ -331,7 +330,7 @@ class MockRemote(object):
if build_error:
raise MockRemoteError("Error occurred during build {}: {}"
- .format(os.path.basename(self.pkg), build_error))
+ .format(os.path.basename(self.pkg), build_error))
self.on_success_build()
return build_details
diff --git a/backend/backend/mockremote/builder.py
b/backend/backend/mockremote/builder.py
index 978998c..1f3b800 100644
--- a/backend/backend/mockremote/builder.py
+++ b/backend/backend/mockremote/builder.py
@@ -308,12 +308,10 @@ class Builder(object):
remote_src = "{0}@{1}:{2}".format(self.username, self.hostname, rpd)
ssh_opts = "'ssh -o PasswordAuthentication=no -o
StrictHostKeyChecking=no'"
- stdout_filepath = os.path.join(destdir,
"build-{}.rsync_out.log".format(self.job.build_id))
- stderr_filepath = os.path.join(destdir,
"build-{}.rsync_err.log".format(self.job.build_id))
-
- command = "{} -avH -e {} {} {}/ > {} 2> {}".format(
+ rsync_log_filepath = os.path.join(destdir,
"build-{}.rsync.log".format(self.job.build_id))
+ command = "{} -avH -e {} {} {}/ &> {}".format(
rsync, ssh_opts, remote_src, destdir,
- stdout_filepath, stderr_filepath)
+ rsync_log_filepath)
# dirty magic with Popen due to IO buffering
# see
http://thraxil.org/users/anders/posts/2008/03/13/Subprocess-Hanging-PIPE-...