On Sat, May 14, 2011 at 11:54 AM, Dave Reisner <d@falconindy.com> wrote:

The addition of the DB version check introduces a lag time between the lockfile creation and the transaction initialization. In cases where the local DB is large enough and/or the user's disk is slow enough, this time is significant enough that its possible for a user to send a SIGINT and leave behind a db.lck file.

Seems OK to me...this code is full of dragons anyway.

Signed-off-by: Dave Reisner <d@falconindy.com> ---  lib/libalpm/trans.c |   19 ++++++++++---------  1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 4e88668..af1bcce 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -116,15 +116,6 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,                }        }

-       /* check database version */ -       db_version = _alpm_db_version(handle->db_local); -       if(db_version < required_db_version) { -               _alpm_log(PM_LOG_ERROR, -                               _("%s database version is too old\n"), handle->db_local->treename); -               remove_lock(handle); -               RET_ERR(PM_ERR_DB_VERSION, -1); -       } -        trans = _alpm_trans_new();        if(trans == NULL) {                RET_ERR(PM_ERR_MEMORY, -1); @@ -138,6 +129,16 @@ int SYMEXPORT alpm_trans_init(pmtransflag_t flags,

       handle->trans = trans;

+       /* check database version */ +       db_version = _alpm_db_version(handle->db_local); +       if(db_version < required_db_version) { +               _alpm_log(PM_LOG_ERROR, +                               _("%s database version is too old\n"), handle->db_local->treename); +               remove_lock(handle); +               _alpm_trans_free(trans); +               RET_ERR(PM_ERR_DB_VERSION, -1); +       } +        return 0;  }

-- 1.7.5.1