[virt-tools-list] [virt-manager PATCH] cloudinit: Fixed broken testsuite

Athina Plaskasoviti athina.plaskasoviti at gmail.com
Mon Jul 8 05:53:36 UTC 2019


Signed-off-by: Athina Plaskasoviti <athina.plaskasoviti at gmail.com>
---
 virtinst/install/installerinject.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/virtinst/install/installerinject.py b/virtinst/install/installerinject.py
index 7ad4833f..812f9829 100644
--- a/virtinst/install/installerinject.py
+++ b/virtinst/install/installerinject.py
@@ -58,7 +58,7 @@ def _run_iso_commands(iso, tempdir, cloudinit=False):
     log.debug("cmd output: %s", output)
 
 
-def _perform_generic_injections(injections, scratchdir, media, cb, cloudinit=False):
+def _perform_generic_injections(injections, scratchdir, media, cb, **kwargs):
     if not injections:
         return
 
@@ -76,17 +76,17 @@ def _perform_generic_injections(injections, scratchdir, media, cb, cloudinit=Fal
                     filename, dst, media)
             shutil.copy(filename, os.path.join(tempdir, dst))
 
-        return cb(media, tempdir, cloudinit)
+        return cb(media, tempdir, **kwargs)
     finally:
         shutil.rmtree(tempdir)
 
 
-def perform_initrd_injections(initrd, injections, scratchdir, cloudinit=False):
+def perform_initrd_injections(initrd, injections, scratchdir):
     """
     Insert files into the root directory of the initial ram disk
     """
     _perform_generic_injections(injections, scratchdir, initrd,
-            _run_initrd_commands, cloudinit)
+            _run_initrd_commands)
 
 
 def perform_cdrom_injections(injections, scratchdir, cloudinit=False):
@@ -100,7 +100,7 @@ def perform_cdrom_injections(injections, scratchdir, cloudinit=False):
 
     try:
         _perform_generic_injections(injections, scratchdir, iso,
-            _run_iso_commands, cloudinit)
+            _run_iso_commands, cloudinit=cloudinit)
     except Exception:  # pragma: no cover
         os.unlink(iso)
         raise
-- 
2.20.1




More information about the virt-tools-list mailing list