From 768cfb760a9ae70aa84ddd2453048f692397b47f Mon Sep 17 00:00:00 2001 From: Peter Staab Date: Sun, 20 Aug 2023 17:06:00 -0400 Subject: [PATCH] Switch rmtree to Mojo::File::remove_tree --- lib/WeBWorK/ContentGenerator/Hardcopy.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/WeBWorK/ContentGenerator/Hardcopy.pm b/lib/WeBWorK/ContentGenerator/Hardcopy.pm index 117d6240df..d42292ac8b 100644 --- a/lib/WeBWorK/ContentGenerator/Hardcopy.pm +++ b/lib/WeBWorK/ContentGenerator/Hardcopy.pm @@ -26,6 +26,7 @@ problem sets. use File::Path; use File::Copy qw(move copy); use File::Temp qw/tempdir/; +use Mojo::File; use String::ShellQuote; use Archive::Zip::SimpleZip qw($SimpleZipError); use XML::LibXML; @@ -629,14 +630,11 @@ async sub generate_hardcopy ($c, $format, $userIDsRef, $setIDsRef) { # helper function to remove temp dirs sub delete_temp_dir ($c, $temp_dir_path) { - rmtree($temp_dir_path), { error => \my $err }; + Mojo::File->new($temp_dir_path)->remove_tree; - if ($err && @$err) { - for my $diag (@$err) { - my ($file, $message) = %$diag; - $c->add_error('Failed to remove temporary directory "', - $c->tag('code', $file, '":', $c->tag('br'), $c->tag('pre', $message))); - } + if ($!) { + $c->add_error('Failed to remove temporary directory "', + $c->tag('code', $file, '":', $c->tag('br'), $c->tag('pre', $!))); } return; }