fix issue

uutils · Dec 30, 2023 · e608ffa · e608ffa
1 parent 68c99f1
commit e608ffa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/uu/rm/src/rm.rs b/src/uu/rm/src/rm.rs
@@ -344,8 +344,14 @@ fn remove_dir_all_recursive_continue(path: &Path) -> Result<(), bool> {
     let mut had_err = false;
 
     for child in fs::read_dir(path).map_err(|e| {
-        show_error!("cannot remove {}: {}", path.quote(), format_io_error(&e));
-        true
+        if e.kind() == std::io::ErrorKind::PermissionDenied {
+            // we will be able to manage it later with remove_dir
+            // so, no need to show an error
+            false
+        } else {
+            show_error!("cannot remove {}: {}", path.quote(), format_io_error(&e));
+            true
+        }
     })? {
         match child {
             Ok(child) => {

diff --git a/util/build-gnu.sh b/util/build-gnu.sh
@@ -205,6 +205,7 @@ sed -i -e "s|rm: cannot remove 'a/b'|rm: cannot remove 'a'|g" tests/rm/fail-2epe
 sed -i -e "s|rm: cannot remove 'a/1'|rm: cannot remove 'a'|g" tests/rm/rm2.sh
 
 sed -i -e "s|removed directory 'a/'|removed directory 'a'|g" tests/rm/v-slash.sh
+sed -i "s|\$prog: cannot remove '\$d': Permission denied\\\n||" tests/rm/unreadable.pl
 
 # our error messages are better
 if ! grep -q "rm: cannot remove 'b'" tests/rm/rm1.sh; then