lib: Fix endless upgrade problem
authorAustin Clements <amdragon@mit.edu>
Mon, 1 Sep 2014 22:49:07 +0000 (18:49 -0400)
committerDavid Bremner <david@tethera.net>
Tue, 2 Sep 2014 06:06:51 +0000 (23:06 -0700)
commitcca05ac10e908c2a8d7fdb3beac59bc085de9702
treed56b5bf772352c2ce78e51969845fc79f491a807
parent658a00e7c809cc4e3076aab28e105d3761086451
lib: Fix endless upgrade problem

48db8c8 introduced a disagreement between when
notmuch_database_needs_upgrade returned TRUE and when
notmuch_database_upgrade actually performed an upgrade.  As a result,
if a database had a version less than 3, but no new features were
required, notmuch new would call notmuch_database_upgrade to perform
an upgrade, but notmuch_database_upgrade would return immediately
without updating the database version.  Hence, the next notmuch new
would do the same, and so on.

Fix this by ensuring that the upgrade-required logic is identical
between the two.
lib/database.cc