fepitre / rpms / pungi

Forked from rpms/pungi 5 years ago
Clone
Blob Blame History Raw
From 05384eae584476bfca3bd4bf31958d1e5dbb20a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Mon, 4 Apr 2016 15:13:35 +0200
Subject: [PATCH 3/3] [ostree] Fix call to kobo.shortcuts.run
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 pungi/atomic.py             | 4 ++--
 tests/test_atomic_script.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pungi/atomic.py b/pungi/atomic.py
index 95ccfe0..7c0075b 100644
--- a/pungi/atomic.py
+++ b/pungi/atomic.py
@@ -22,13 +22,13 @@ def init_atomic_repo(repo, log_dir=None):
     log_file = make_log_file(log_dir, 'init-atomic-repo')
     if not os.path.isdir(repo):
         shortcuts.run(['ostree', 'init', '--repo={}'.format(repo), '--mode=archive-z2'],
-                      log_file=log_file)
+                      logfile=log_file)
 
 
 def make_ostree_repo(repo, config, log_dir=None):
     log_file = make_log_file(log_dir, 'create-atomic-repo')
     shortcuts.run(['rpm-ostree', 'compose', 'tree', '--repo={}'.format(repo), config],
-                  log_file=log_file)
+                  logfile=log_file)
 
 
 def run(opts):
diff --git a/tests/test_atomic_script.py b/tests/test_atomic_script.py
index 13aa825..a871659 100755
--- a/tests/test_atomic_script.py
+++ b/tests/test_atomic_script.py
@@ -28,10 +28,10 @@ class OstreeScriptTest(helpers.PungiTestCase):
         self.assertItemsEqual(
             run.call_args_list,
             [mock.call(['ostree', 'init', '--repo={}/atomic'.format(self.topdir), '--mode=archive-z2'],
-                       log_file=self.topdir + '/logs/Atomic/init-atomic-repo.log'),
+                       logfile=self.topdir + '/logs/Atomic/init-atomic-repo.log'),
              mock.call(['rpm-ostree', 'compose', 'tree', '--repo={}/atomic'.format(self.topdir),
                         self.topdir + '/work/fedora-atomic-docker-host.json'],
-                       log_file=self.topdir + '/logs/Atomic/create-atomic-repo.log')])
+                       logfile=self.topdir + '/logs/Atomic/create-atomic-repo.log')])
 
 
 if __name__ == '__main__':
-- 
2.7.3