[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH v2 3/5] v2v: ova: move the untar function



Move the untar function so it can be used later in the code.

Signed-off-by: Tomáš Golembiovský <tgolembi redhat com>
---
 v2v/input_ova.ml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
index db884d9..f76fe82 100644
--- a/v2v/input_ova.ml
+++ b/v2v/input_ova.ml
@@ -38,6 +38,12 @@ object
   method as_options = "-i ova " ^ ova
 
   method source () =
+
+    let untar ?(format = "") file outdir =
+      let cmd = [ "tar"; sprintf "-x%sf" format; file; "-C"; outdir ] in
+      if run_command cmd <> 0 then
+        error (f_"error unpacking %s, see earlier error messages") ova in
+
     (* Extract ova file. *)
     let exploded =
       (* The spec allows a directory to be specified as an ova.  This
@@ -61,11 +67,6 @@ object
 
           tmpfile in
 
-        let untar ?(format = "") file outdir =
-          let cmd = [ "tar"; sprintf "-x%sf" format; file; "-C"; outdir ] in
-          if run_command cmd <> 0 then
-            error (f_"error unpacking %s, see earlier error messages") ova in
-
         match detect_file_type ova with
         | `Tar ->
           (* Normal ovas are tar file (not compressed). *)
-- 
2.10.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]