Re: [PATCH v2] test-lib.sh: try to re-chmod & retry on failed trash removal
From: Junio C Hamano <hidden>
Date: 2021-10-12 23:03:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2021-10-11 · [PATCH v2] test-lib.sh: try to re-chmod & retry on failed trash removal · Ævar Arnfjörð Bjarmason <hidden>
Mostly looking good, but I applied the following on top to be squashed in. Thanks. -- >8 -- Style fix plus adding more paranoia to cope with the lost 'r' bit.
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 138a26c19b..d820910154 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh@@ -1386,11 +1386,11 @@ export HOME GNUPGHOME # "rm -rf" existing trash directory, even if a previous run left it # with bad permissions. -remove_trash_directory() { +remove_trash_directory () { dir="$1" if ! rm -rf "$dir" 2>/dev/null then - chmod -R u+wx "$dir" + chmod -R u+rwx "$dir" rm -rf "$dir" fi ! test -d "$dir"