diff --git a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml index a1d2f7595..0c8d2c1ba 100644 --- a/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml +++ b/tests/cli-test-xml/compare/virt-convert-ovf-compare.xml @@ -1,5 +1,3 @@ -Copying test.ovf-disk1.vmdk to /tmp/test.ovf-disk1 -Copying testfile to /tmp/testfile test.ovf 00000000-1111-2222-3333-444444444444 diff --git a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml index ffe7b592f..36d643fd7 100644 --- a/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml +++ b/tests/cli-test-xml/compare/virt-convert-vmx-compare.xml @@ -1,4 +1,3 @@ -Running /usr/bin/qemu-img convert -O qcow2 fedora.vmdk /var/lib/libvirt/images/fedora.qcow2 fedora 00000000-1111-2222-3333-444444444444 diff --git a/virt-convert b/virt-convert index c005193b2..a7f9a97c8 100755 --- a/virt-convert +++ b/virt-convert @@ -97,9 +97,12 @@ def main(conn=None): options.quiet = True conscb = options.autoconsole and cli.show_console_for_guest or None + print_cb = print_stdout + if options.quiet: + print_cb = None converter = VirtConverter(conn, options.input, - input_name=options.input_format, print_cb=print_stdout) + input_name=options.input_format, print_cb=print_cb) try: converter.convert_disks(options.disk_format or "none", destdir=options.destination, dry=options.dry) diff --git a/virtconv/formats.py b/virtconv/formats.py index ff997c630..bfd9e8811 100644 --- a/virtconv/formats.py +++ b/virtconv/formats.py @@ -174,15 +174,20 @@ class VirtConverter(object): """ Public interface for actually performing the conversion """ - def __init__(self, conn, input_file, print_cb=None, input_name=None): + def __init__(self, conn, input_file, print_cb=-1, input_name=None): self.conn = conn self._err_clean = [] self._force_clean = [] - if print_cb is None: + if print_cb == -1: def cb(msg): print msg print_cb = cb + if print_cb is None: + def cb(msg): + ignore = msg + pass + print_cb = cb self.print_cb = print_cb parser = None