[PATCH 10/14] lib: fix return value for n_directory_delete

Subject: [PATCH 10/14] lib: fix return value for n_directory_delete

Date: Sat, 1 Aug 2020 09:25:59 -0300

To: notmuch@notmuchmail.org

Cc: David Bremner

From: David Bremner

Falling out of the catch meant the error return was lost
---
 lib/directory.cc           | 2 +-
 test/T563-lib-directory.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/directory.cc b/lib/directory.cc
index 79ceea31..eee8254e 100644
--- a/lib/directory.cc
+++ b/lib/directory.cc
@@ -323,7 +323,7 @@ notmuch_directory_delete (notmuch_directory_t *directory)
     }
     notmuch_directory_destroy (directory);
 
-    return NOTMUCH_STATUS_SUCCESS;
+    return status;
 }
 
 void
diff --git a/test/T563-lib-directory.sh b/test/T563-lib-directory.sh
index b91a1c87..7e44e805 100755
--- a/test/T563-lib-directory.sh
+++ b/test/T563-lib-directory.sh
@@ -76,7 +76,6 @@ test_expect_equal_file EXPECTED OUTPUT
 
 backup_database
 test_begin_subtest "delete directory document for a closed db"
-test_subtest_known_broken
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         stat = notmuch_directory_delete (dir);
-- 
2.27.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: