On Mon, Jul 18, 2011 at 8:31 PM, Dan McGee wrote:

As noted by Allan, we failed pretty hard if gpgme was compiled out. With these changes, only sign001.py fails. This can/will be fixed later once we beef up the test suite with more signing tests anyway.

Signed-off-by: Dan McGee ---

s/HAVE_GPGME/HAVE_LIBGPGME/danisstupid -Dan

 lib/libalpm/be_sync.c |    6 ++++++  lib/libalpm/db.c      |    1 -  lib/libalpm/handle.c  |    8 ++++++++  3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index d7e14ba..cd69513 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -600,6 +600,12 @@ alpm_db_t *_alpm_db_register_sync(alpm_handle_t *handle, const char *treename,

       _alpm_log(handle, ALPM_LOG_DEBUG, "registering sync database '%s'\n", treename);

+#ifndef HAVE_GPGME +       if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { +               RET_ERR(handle, ALPM_ERR_WRONG_ARGS, NULL); +       } +#endif +        db = _alpm_db_new(treename, 0);        if(db == NULL) {                RET_ERR(handle, ALPM_ERR_DB_CREATE, NULL); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0c2b26a..746293f 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -327,7 +327,6 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local)        CALLOC(db, 1, sizeof(alpm_db_t), return NULL);        STRDUP(db->treename, treename, return NULL);        db->is_local = is_local; -       db->siglevel = 0;

       return db;  } diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 9bffd4f..be51bfc 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -45,8 +45,10 @@ alpm_handle_t *_alpm_handle_new()

       CALLOC(handle, 1, sizeof(alpm_handle_t), return NULL);

+#ifdef HAVE_GPGME        handle->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL |                ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; +#endif

       return handle;  } @@ -579,7 +581,13 @@ int SYMEXPORT alpm_option_set_default_siglevel(alpm_handle_t *handle,                alpm_siglevel_t level)  {        CHECK_HANDLE(handle, return -1); +#ifdef HAVE_GPGME        handle->siglevel = level; +#else +       if(level != 0 && level != ALPM_SIG_USE_DEFAULT) { +               RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); +       } +#endif        return 0;  }

-- 1.7.6