[Libguestfs] [PATCH v4 7/9] dib: move do_cp to mllib.Commun_utils

Cédric Bosdonnat
Tue, 07 Mar 2017 14:27:03 -0000

---
 dib/utils.ml           | 4 ----
 mllib/common_utils.ml  | 5 +++++
 mllib/common_utils.mli | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dib/utils.ml b/dib/utils.ml
index da5e738ad..e769ebe28 100644
--- a/dib/utils.ml
+++ b/dib/utils.ml
@@ -95,10 +95,6 @@ let require_tool tool    with Executable_not_found tool ->
     error (f_"%s needed but not found") tool

-let do_cp src destdir -  let cmd = [ "cp"; "-t"; destdir;
"-a"; src ] in
-  if run_command cmd <> 0 then exit 1
-
 let ensure_trailing_newline str    if String.length str > 0 &&
str.[String.length str - 1] <> '\n' then str ^ "\n"
   else str
diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml
index e1d63292e..945728b5e 100644
--- a/mllib/common_utils.ml
+++ b/mllib/common_utils.ml
@@ -1167,3 +1167,8 @@ let inspect_decrypt g     * function.
    *)
   c_inspect_decrypt g#ocaml_handle (Guestfs.c_pointer g#ocaml_handle)
+
+let do_cp src destdir +  let cmd = [ "cp"; "-t"; destdir;
"-a"; src ] in
+  if run_command cmd <> 0 then
+    error (f_"copy of %s to %s failed") src destdir
diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli
index 1cd38ba83..5c376fcb3 100644
--- a/mllib/common_utils.mli
+++ b/mllib/common_utils.mli
@@ -492,3 +492,6 @@ val inspect_decrypt : Guestfs.guestfs -> unit
 (** Simple implementation of decryption: look for any [crypto_LUKS]
     partitions and decrypt them, then rescan for VGs.  This only works
     for Fedora whole-disk encryption. *)
+
+val do_cp : string -> string -> unit
+(** Run the cp command, and exit with an error if it failed *)
--
2.11.0