From 8bc838bd9b12c658bd7c6f1d5d22dfc0375ca57b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:56:54 +0100 Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test In RHEL 9 nbdcopy 1.12.4-2 will be sufficient (vs nbdcopy 1.13.5 upstream). We will enforce this through RPM dependencies and test it separately. Thus remove the version check and test. --- output/output.ml | 11 ----------- tests/Makefile.am | 1 - 2 files changed, 12 deletions(-) diff --git a/output/output.ml b/output/output.ml index 23c3932d..496c32b6 100644 --- a/output/output.ml +++ b/output/output.ml @@ -83,17 +83,6 @@ let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false) if output_format <> "qcow2" then error (f_"‘-oo compressed’ is only allowed when the output format \ is a local qcow2-format file, i.e. ‘-of qcow2’"); - - (* Check nbdcopy is new enough. This assumes that the version of - * libnbd is the same as the version of nbdcopy, but parsing this - * is easier. We can remove this check when we build-depend on - * libnbd >= 1.14. - *) - let version = - NBD.create () |> NBD.get_version |> - String.nsplit "." |> List.map int_of_string in - if version < [1; 13; 5] then - error (f_"-oo compressed option requires nbdcopy >= 1.13.5") ); let g = open_guestfs () in diff --git a/tests/Makefile.am b/tests/Makefile.am index a26ecf7a..47e5f10d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -82,7 +82,6 @@ TESTS = \ test-v2v-networks-and-bridges.sh \ test-v2v-o-glance.sh \ test-v2v-o-libvirt.sh \ - test-v2v-o-local-qcow2-compressed.sh \ test-v2v-o-null.sh \ test-v2v-o-openstack.sh \ test-v2v-o-qemu.sh \ -- 2.31.1