[Pkg-libvirt-commits] [libguestfs] 24/65: v2v: test-harness: Use xzcat instead of unxz --keep.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit 6c27ce649b9d4a25625b0c934856da9085d11cb4
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Apr 9 13:34:46 2015 +0100

    v2v: test-harness: Use xzcat instead of unxz --keep.
    
    unxz --keep fails on the symlinks used by git-annex with this
    rather unnecessary error:
    
      unxz --keep 'rhel_511_x86_64_pv.img.xz'
      unxz: rhel_511_x86_64_pv.img.xz: Is a symbolic link, skipping
    
    Use xzcat instead.
---
 v2v/test-harness/v2v_test_harness.ml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/v2v/test-harness/v2v_test_harness.ml b/v2v/test-harness/v2v_test_harness.ml
index 178eae8..ae67de3 100644
--- a/v2v/test-harness/v2v_test_harness.ml
+++ b/v2v/test-harness/v2v_test_harness.ml
@@ -356,10 +356,12 @@ let run ~test ?input_disk ?input_xml ?(test_plan = default_plan) () =
       if Filename.check_suffix input_disk ".xz" then (
         let input_disk_uncomp = Filename.chop_suffix input_disk ".xz" in
         if not (Sys.file_exists input_disk_uncomp) then (
-          let cmd = sprintf "unxz --keep %s" (quote input_disk) in
+          let cmd =
+            sprintf "xzcat %s > %s"
+                    (quote input_disk) (quote input_disk_uncomp) in
           printf "%s\n%!" cmd;
           if Sys.command cmd <> 0 then
-            failwith "unxz command failed"
+            failwith "xzcat command failed"
         );
         input_disk_uncomp
       )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git