Merge branch 'release'

bugfix release being built up on release.
This commit is contained in:
David Bremner 2014-05-18 06:37:48 +09:00
commit c67587f003
3 changed files with 6 additions and 2 deletions

View file

@ -169,7 +169,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
} }
if (output_file_name) { if (output_file_name) {
ret = fdatasync (outfd); ret = fsync (outfd);
if (ret) { if (ret) {
fprintf (stderr, "Error syncing %s to disk: %s\n", fprintf (stderr, "Error syncing %s to disk: %s\n",
name_for_error, strerror (errno)); name_for_error, strerror (errno));

View file

@ -16,7 +16,7 @@ $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
$(call quiet,CC) $^ -o $@ $(call quiet,CC) $^ -o $@
$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a $(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
$(call quiet,CC) $^ -o $@ -ltalloc $(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@
random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \ random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \
notmuch-config.o command-line-arguments.o \ notmuch-config.o command-line-arguments.o \

View file

@ -18,6 +18,10 @@ shell echo 0 > outcount
shell touch inodes shell touch inodes
# work around apparent issue with lazy library loading on some
# platforms
set breakpoint pending on
break rename break rename
commands commands
# As an optimization, only consider snapshots after a Xapian commit. # As an optimization, only consider snapshots after a Xapian commit.