[Pkg-libvirt-commits] [libguestfs] 20/61: v2v: -i ova: Don't fail when given a relative path to an OVA directory (RHBZ#1155121).

[Hilko Bengen]

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

bengen pushed a commit to annotated tag debian/1%1.28.2-1
in repository libguestfs.

commit f488853443715e37cede838f6b5c6173b1eaee2d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Oct 21 13:36:55 2014 +0100

    v2v: -i ova: Don't fail when given a relative path to an OVA directory (RHBZ#1155121).
    
    (cherry picked from commit e1eccae2da3a670c1ef7626c8779b71fb1877f7d)
---
 v2v/input_ova.ml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
index 6349c76..d9928de 100644
--- a/v2v/input_ova.ml
+++ b/v2v/input_ova.ml
@@ -66,6 +66,11 @@ object
           error (f_"%s: unsupported file format") ova
       ) in
 
+    (* Exploded path must be absolute (RHBZ#1155121). *)
+    let exploded =
+      if not (Filename.is_relative exploded) then exploded
+      else Sys.getcwd () // exploded in
+
     let files = Sys.readdir exploded in
     let ovf = ref "" in
     (* Search for the ovf file. *)

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