[Libguestfs] [PATCH v6 07/10] dib: move do_cp to mllib.Commun_utils

[Cédric Bosdonnat]

---
 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 afa2ec944..2fe70e7fc 100644
--- a/dib/utils.ml
+++ b/dib/utils.ml
@@ -98,10 +98,6 @@ let get_required_tool tool =
 let require_tool tool =
   ignore (get_required_tool 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 63d8dd92e..ceac57711 100644
--- a/mllib/common_utils.ml
+++ b/mllib/common_utils.ml
@@ -1186,3 +1186,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 ec41a8ff8..937ef818b 100644
--- a/mllib/common_utils.mli
+++ b/mllib/common_utils.mli
@@ -496,3 +496,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.12.0