diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
| commit | f4a5faa9dcadc698383e15743ac5f974ee0e3c8b (patch) | |
| tree | 96124567d5604c496cf8d2848ffe348de0b701ac /gnu/packages/patches/xapian-revert-5489fb2f8.patch | |
| parent | 16b89ecc1f2f1f9651d119518c0e752b01f0f07b (diff) | |
| parent | adde15186da7529b85097fdafffc2a13b0e60bdf (diff) | |
| download | guix-f4a5faa9dcadc698383e15743ac5f974ee0e3c8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/xapian-revert-5489fb2f8.patch')
| -rw-r--r-- | gnu/packages/patches/xapian-revert-5489fb2f8.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gnu/packages/patches/xapian-revert-5489fb2f8.patch b/gnu/packages/patches/xapian-revert-5489fb2f8.patch deleted file mode 100644 index 7b78e2abb5..0000000000 --- a/gnu/packages/patches/xapian-revert-5489fb2f8.patch +++ /dev/null @@ -1,23 +0,0 @@ -Revert this upstream commit which breaks a test case in "notmuch": - -https://git.xapian.org/?p=xapian;a=commitdiff;h=5489fb2f838c0f0b0a593b4c17df282a93a1fe5a - -See the notmuch FAQ entry: - -https://notmuchmail.org/faq/#index12h2 - -This should be fixed for later releases. - -diff --git a/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc -index 80e578b85..a47f14a68 100644 ---- a/backends/glass/glass_postlist.cc -+++ b/backends/glass/glass_postlist.cc -@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_, - (void)need_pos; - if (term_.empty()) - RETURN(NULL); -- if (!this_db.get() || this_db->postlist_table.is_modified()) -+ if (!this_db.get() || this_db->postlist_table.is_writable()) - RETURN(NULL); - RETURN(new GlassPostList(this_db, term_, cursor->clone())); - } |