Skip to content

Commit

Permalink
builder, dib: Replace On_exit.rmdir with On_exit.rm_rf
Browse files Browse the repository at this point in the history
Update common submodule.
  • Loading branch information
rwmjones committed Jul 15, 2022
1 parent b49ee90 commit f5baf83
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion builder/builder.ml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ let main () =
* create.
*)
let tmpdir = Mkdtemp.temp_dir "virt-builder." in
On_exit.rmdir tmpdir;
On_exit.rm_rf tmpdir;

(* Download the sources. *)
let downloader = Downloader.create ~curl:cmdline.curl ~cache ~tmpdir in
Expand Down
2 changes: 1 addition & 1 deletion builder/index_parser_tests.ml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ open Tools_utils

let tmpdir =
let tmpdir = Mkdtemp.temp_dir "guestfs-tests." in
On_exit.rmdir tmpdir;
On_exit.rm_rf tmpdir;
tmpdir

let dummy_sigchecker = Sigchecker.create ~gpg:"gpg"
Expand Down
2 changes: 1 addition & 1 deletion builder/repository_main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ let main () =
(* Create a temporary folder to work in *)
let tmpdir = Mkdtemp.temp_dir ~base_dir:cmdline.repo
"virt-builder-repository." in
On_exit.rmdir tmpdir;
On_exit.rm_rf tmpdir;

let tmprepo = tmpdir // "repo" in
mkdir_p tmprepo 0o700;
Expand Down
2 changes: 1 addition & 1 deletion common
2 changes: 1 addition & 1 deletion dib/dib.ml
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ let main () =
let image_basename_d = image_basename ^ ".d" in

let tmpdir = Mkdtemp.temp_dir "dib." in
On_exit.rmdir tmpdir;
On_exit.rm_rf tmpdir;
let auxtmpdir = tmpdir // "in_target.aux" in
do_mkdir auxtmpdir;
let hookstmpdir = auxtmpdir // "hooks" in
Expand Down

0 comments on commit f5baf83

Please sign in to comment.