mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

v2v: parse OVF: Replace Str with PCRE.

Browse Source
This commit is contained in:
Richard W.M. Jones
2017-09-21 14:46:09 +01:00
parent 9f0aad1f37
commit 49208f243f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
v2v/parse_ovf_from_ova.ml
View File

@@ -142,10 +142,10 @@ let parse_ovf_from_ova ovf_filename =
Xml.xpathctx_set_current_context xpathctx n;
let file_id = xpath_string_default "rasd:HostResource/text()" "" in
let rex = Str.regexp "^\\(ovf:\\)?/disk/\\(.*\\)" in
if Str.string_match rex file_id 0 then (
let rex = PCRE.compile "^(?:ovf:)?/disk/(.*)" in
if PCRE.matches rex file_id then (
(* Chase the references through to the actual file name. *)
let file_id = Str.matched_group 2 file_id in
let file_id = PCRE.sub 1 in
let expr = sprintf "/ovf:Envelope/ovf:DiskSection/ovf:Disk[@ovf:diskId='%s']/@ovf:fileRef" file_id in
let file_ref =
match xpath_string expr with