On Mon, 07 Oct 2013, Austin Clements <amdragon@MIT.EDU> wrote: > Previously, the CLI would print a deprecation warning if a client > requested any format version other than the current one. However, if > we add fields that are backwards-compatible, but want clients to be > able to depend on, we need to bump the version, but that doesn't make > the older version deprecated. > > Hence, separate out the "minimum active" version and only print a > warning for requests below this version number. > --- > notmuch-client.h | 5 +++++ > notmuch.c | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/notmuch-client.h b/notmuch-client.h > index afb0ddf..8d986f4 100644 > --- a/notmuch-client.h > +++ b/notmuch-client.h > @@ -142,6 +142,11 @@ chomp_newline (char *str) > /* The minimum supported structured output format version. Requests > * for format versions below this will return an error. */ > #define NOTMUCH_FORMAT_MIN 1 > +/* The minimum non-deprecated structured output format version. > + * Requests for format versions below this will print a stern warning. > + * Must be >= NOTMUCH_FORMAT_MIN and < NOTMUCH_FORMAT_CUR. > + */ Should this be <= NOTMUCH_FORMAT_CUR ? Best wishes Mark > +#define NOTMUCH_FORMAT_MIN_ACTIVE 1 > > /* The output format version requested by the caller on the command > * line. If no format version is requested, this will be set to > diff --git a/notmuch.c b/notmuch.c > index 7300c21..6588003 100644 > --- a/notmuch.c > +++ b/notmuch.c > @@ -125,7 +125,7 @@ by the notmuch CLI (it requires at least version %d). You may need to\n\ > upgrade your notmuch front-end.\n", > notmuch_format_version, NOTMUCH_FORMAT_MIN); > exit (NOTMUCH_EXIT_FORMAT_TOO_OLD); > - } else if (notmuch_format_version != NOTMUCH_FORMAT_CUR) { > + } else if (notmuch_format_version < NOTMUCH_FORMAT_MIN_ACTIVE) { > /* Warn about old version requests so compatibility issues are > * less likely when we drop support for a deprecated format > * versions. */ > -- > 1.8.4.rc3 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch