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"
