From 1bf4bec32ceb1a82b55e3545f3cbeb62757872a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Fri, 8 Apr 2016 11:17:49 +0200 Subject: [PATCH] [ostree] Log to stdout as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lubomír Sedlář --- pungi/ostree.py | 4 ++-- tests/test_ostree_script.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pungi/ostree.py b/pungi/ostree.py index 205b7299..846daeea 100644 --- a/pungi/ostree.py +++ b/pungi/ostree.py @@ -34,13 +34,13 @@ def init_ostree_repo(repo, log_dir=None): if not os.path.isdir(repo): ensure_dir(repo) shortcuts.run(['ostree', 'init', '--repo={}'.format(repo), '--mode=archive-z2'], - show_cmd=True, logfile=log_file) + show_cmd=True, stdout=True, logfile=log_file) def make_ostree_repo(repo, config, log_dir=None): log_file = make_log_file(log_dir, 'create-ostree-repo') shortcuts.run(['rpm-ostree', 'compose', 'tree', '--repo={}'.format(repo), config], - show_cmd=True, logfile=log_file) + show_cmd=True, stdout=True, logfile=log_file) def run(opts): diff --git a/tests/test_ostree_script.py b/tests/test_ostree_script.py index 15034e85..c9c6c35e 100755 --- a/tests/test_ostree_script.py +++ b/tests/test_ostree_script.py @@ -31,10 +31,10 @@ class OstreeScriptTest(helpers.PungiTestCase): self.assertItemsEqual( run.call_args_list, [mock.call(['ostree', 'init', '--repo={}'.format(repo), '--mode=archive-z2'], - logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True), + logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True), mock.call(['rpm-ostree', 'compose', 'tree', '--repo={}'.format(repo), self.topdir + '/fedora-atomic-docker-host.json'], - logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True)]) + logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)]) if __name__ == '__main__':