1 files changed, 74 insertions, 147 deletions

diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 31336144..0584a36f 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -45,17 +45,16 @@
  */
 
 /** Register a sync database of packages. */
-pmdb_t SYMEXPORT *alpm_db_register_sync(const char *treename)
+pmdb_t SYMEXPORT *alpm_db_register_sync(pmhandle_t *handle, const char *treename)
 {
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, NULL));
-	ASSERT(treename != NULL && strlen(treename) != 0, RET_ERR(PM_ERR_WRONG_ARGS, NULL));
+	ASSERT(handle != NULL, return NULL);
+	ASSERT(treename != NULL && strlen(treename) != 0,
+			RET_ERR(handle, PM_ERR_WRONG_ARGS, NULL));
 	/* Do not register a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, NULL));
+	ASSERT(handle->trans == NULL, RET_ERR(handle, PM_ERR_TRANS_NOT_NULL, NULL));
 
-	return _alpm_db_register_sync(treename);
+	return _alpm_db_register_sync(handle, treename);
 }
 
 /* Helper function for alpm_db_unregister{_all} */
@@ -65,22 +64,20 @@ void _alpm_db_unregister(pmdb_t *db)
 		return;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
+	_alpm_log(db->handle, PM_LOG_DEBUG, "unregistering database '%s'\n", db->treename);
 	_alpm_db_free(db);
 }
 
 /** Unregister all package databases. */
-int SYMEXPORT alpm_db_unregister_all(void)
+int SYMEXPORT alpm_db_unregister_all(pmhandle_t *handle)
 {
 	alpm_list_t *i;
 	pmdb_t *db;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
+	ASSERT(handle != NULL, return -1);
 	/* Do not unregister a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
+	ASSERT(handle->trans == NULL, RET_ERR(handle, PM_ERR_TRANS_NOT_NULL, -1));
 
 	/* unregister all sync dbs */
 	for(i = handle->dbs_sync; i; i = i->next) {
@@ -96,14 +93,13 @@ int SYMEXPORT alpm_db_unregister_all(void)
 int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 {
 	int found = 0;
-
-	ALPM_LOG_FUNC;
+	pmhandle_t *handle;
 
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(db != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(db != NULL, return -1);
 	/* Do not unregister a database if a transaction is on-going */
-	ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1));
+	handle = db->handle;
+	ASSERT(handle->trans == NULL, RET_ERR(handle, PM_ERR_TRANS_NOT_NULL, -1));
 
 	if(db == handle->db_local) {
 		handle->db_local = NULL;
@@ -122,7 +118,7 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 	}
 
 	if(!found) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
+		RET_ERR(handle, PM_ERR_DB_NOT_FOUND, -1);
 	}
 
 	db->ops->unregister(db);
@@ -132,22 +128,14 @@ int SYMEXPORT alpm_db_unregister(pmdb_t *db)
 /** Get the serverlist of a database. */
 alpm_list_t SYMEXPORT *alpm_db_get_servers(const pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL));
-
-	return(db->servers);
+	ASSERT(db != NULL, return NULL);
+	return db->servers;
 }
 
 /** Set the serverlist of a database. */
 int SYMEXPORT alpm_db_set_servers(pmdb_t *db, alpm_list_t *servers)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-
+	ASSERT(db != NULL, return -1);
 	if(db->servers) FREELIST(db->servers);
 	db->servers = servers;
 	return 0;
@@ -158,7 +146,7 @@ static char *sanitize_url(const char *url)
 	char *newurl;
 	size_t len = strlen(url);
 
-	STRDUP(newurl, url, RET_ERR(PM_ERR_MEMORY, NULL));
+	STRDUP(newurl, url, return NULL);
 	/* strip the trailing slash if one exists */
 	if(newurl[len - 1] == '/') {
 		newurl[len - 1] = '\0';
@@ -175,18 +163,16 @@ int SYMEXPORT alpm_db_add_server(pmdb_t *db, const char *url)
 {
 	char *newurl;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(db != NULL, return -1);
+	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(db->handle, PM_ERR_WRONG_ARGS, -1));
 
 	newurl = sanitize_url(url);
 	if(!newurl) {
 		return -1;
 	}
 	db->servers = alpm_list_add(db->servers, newurl);
-	_alpm_log(PM_LOG_DEBUG, "adding new server URL to database '%s': %s\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "adding new server URL to database '%s': %s\n",
 			db->treename, newurl);
 
 	return 0;
@@ -202,11 +188,9 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url)
 {
 	char *newurl, *vdata = NULL;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(db != NULL, return -1);
+	ASSERT(url != NULL && strlen(url) != 0, RET_ERR(db->handle, PM_ERR_WRONG_ARGS, -1));
 
 	newurl = sanitize_url(url);
 	if(!newurl) {
@@ -215,7 +199,7 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url)
 	db->servers = alpm_list_remove_str(db->servers, newurl, &vdata);
 	free(newurl);
 	if(vdata) {
-		_alpm_log(PM_LOG_DEBUG, "removed server URL from database '%s': %s\n",
+		_alpm_log(db->handle, PM_LOG_DEBUG, "removed server URL from database '%s': %s\n",
 				db->treename, newurl);
 		free(vdata);
 		return 0;
@@ -230,55 +214,26 @@ int SYMEXPORT alpm_db_remove_server(pmdb_t *db, const char *url)
  */
 int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify)
 {
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
+	ASSERT(db != NULL, return -1);
 
 	db->pgp_verify = verify;
-	_alpm_log(PM_LOG_DEBUG, "adding VerifySig option to database '%s': %d\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "adding VerifySig option to database '%s': %d\n",
 			db->treename, verify);
 
-	return(0);
+	return 0;
 }
 
 /** Get the name of a package database. */
 const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
 	ASSERT(db != NULL, return NULL);
-
 	return db->treename;
 }
 
-/** Get a download URL for the package database. */
-const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db)
-{
-	char *url;
-
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
-	ASSERT(db != NULL, return NULL);
-	ASSERT(db->servers != NULL, return NULL);
-
-	url = (char *)db->servers->data;
-
-	return url;
-}
-
-
 /** Get a package entry from a package database. */
 pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
 	ASSERT(db != NULL, return NULL);
 	ASSERT(name != NULL && strlen(name) != 0, return NULL);
 
@@ -288,22 +243,13 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
 /** Get the package cache of a package database. */
 alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
 	ASSERT(db != NULL, return NULL);
-
 	return _alpm_db_get_pkgcache(db);
 }
 
 /** Get a group entry from a package database. */
 pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
 	ASSERT(db != NULL, return NULL);
 	ASSERT(name != NULL && strlen(name) != 0, return NULL);
 
@@ -313,10 +259,6 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
 /** Get the group cache of a package database. */
 alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
 	ASSERT(db != NULL, return NULL);
 
 	return _alpm_db_get_grpcache(db);
@@ -325,10 +267,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
 /** Searches a database. */
 alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return NULL);
 	ASSERT(db != NULL, return NULL);
 
 	return _alpm_db_search(db, needles);
@@ -337,18 +275,16 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 /** Set install reason for a package in db. */
 int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
+	ASSERT(db != NULL, return -1);
+	/* TODO assert db == db_local ? shouldn't need a db param at all here... */
+	ASSERT(name != NULL, RET_ERR(db->handle, PM_ERR_WRONG_ARGS, -1));
 
 	pmpkg_t *pkg = _alpm_db_get_pkgfromcache(db, name);
 	if(pkg == NULL) {
-		RET_ERR(PM_ERR_PKG_NOT_FOUND, -1);
+		RET_ERR(db->handle, PM_ERR_PKG_NOT_FOUND, -1);
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "setting install reason %u for %s/%s\n", reason, db->treename, name);
+	_alpm_log(db->handle, PM_LOG_DEBUG, "setting install reason %u for %s/%s\n", reason, db->treename, name);
 	if(alpm_pkg_get_reason(pkg) == reason) {
 		/* we are done */
 		return 0;
@@ -357,7 +293,7 @@ int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t
 	pkg->reason = reason;
 	/* write DESC */
 	if(_alpm_local_db_write(db, pkg, INFRQ_DESC)) {
-		RET_ERR(PM_ERR_DB_WRITE, -1);
+		RET_ERR(db->handle, PM_ERR_DB_WRITE, -1);
 	}
 
 	return 0;
@@ -369,19 +305,16 @@ pmdb_t *_alpm_db_new(const char *treename, int is_local)
 {
 	pmdb_t *db;
 
-	ALPM_LOG_FUNC;
-
-	CALLOC(db, 1, sizeof(pmdb_t), RET_ERR(PM_ERR_MEMORY, NULL));
-	STRDUP(db->treename, treename, RET_ERR(PM_ERR_MEMORY, NULL));
+	CALLOC(db, 1, sizeof(pmdb_t), return NULL);
+	STRDUP(db->treename, treename, return NULL);
 	db->is_local = is_local;
+	db->pgp_verify = PM_PGP_VERIFY_UNKNOWN;
 
 	return db;
 }
 
 void _alpm_db_free(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	/* cleanup pkgcache */
 	_alpm_db_free_pkgcache(db);
 	/* cleanup server list */
@@ -402,23 +335,23 @@ const char *_alpm_db_path(pmdb_t *db)
 		const char *dbpath;
 		size_t pathsize;
 
-		dbpath = alpm_option_get_dbpath();
+		dbpath = alpm_option_get_dbpath(db->handle);
 		if(!dbpath) {
-			_alpm_log(PM_LOG_ERROR, _("database path is undefined\n"));
-			RET_ERR(PM_ERR_DB_OPEN, NULL);
+			_alpm_log(db->handle, PM_LOG_ERROR, _("database path is undefined\n"));
+			RET_ERR(db->handle, PM_ERR_DB_OPEN, NULL);
 		}
 
 		if(db->is_local) {
 			pathsize = strlen(dbpath) + strlen(db->treename) + 2;
-			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			CALLOC(db->_path, 1, pathsize, RET_ERR(db->handle, PM_ERR_MEMORY, NULL));
 			sprintf(db->_path, "%s%s/", dbpath, db->treename);
 		} else {
 			pathsize = strlen(dbpath) + 5 + strlen(db->treename) + 4;
-			CALLOC(db->_path, 1, pathsize, RET_ERR(PM_ERR_MEMORY, NULL));
+			CALLOC(db->_path, 1, pathsize, RET_ERR(db->handle, PM_ERR_MEMORY, NULL));
 			/* all sync DBs now reside in the sync/ subdir of the dbpath */
 			sprintf(db->_path, "%ssync/%s.db", dbpath, db->treename);
 		}
-		_alpm_log(PM_LOG_DEBUG, "database path for tree %s set to %s\n",
+		_alpm_log(db->handle, PM_LOG_DEBUG, "database path for tree %s set to %s\n",
 				db->treename, db->_path);
 	}
 	return db->_path;
@@ -432,6 +365,20 @@ int _alpm_db_version(pmdb_t *db)
 	return db->ops->version(db);
 }
 
+char *_alpm_db_sig_path(pmdb_t *db)
+{
+	char *sigpath;
+	size_t len;
+	const char *dbfile = _alpm_db_path(db);
+	if(!db || !dbfile) {
+		return NULL;
+	}
+	len = strlen(dbfile) + strlen(".sig") + 1;
+	CALLOC(sigpath, len, sizeof(char), RET_ERR(db->handle, PM_ERR_MEMORY, NULL));
+	sprintf(sigpath, "%s.sig", dbfile);
+	return sigpath;
+}
+
 int _alpm_db_cmp(const void *d1, const void *d2)
 {
 	pmdb_t *db1 = (pmdb_t *)d1;
@@ -446,8 +393,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 	/* copy the pkgcache- we will free the list var after each needle */
 	alpm_list_t *list = alpm_list_copy(_alpm_db_get_pkgcache(db));
 
-	ALPM_LOG_FUNC;
-
 	for(i = needles; i; i = i->next) {
 		char *targ;
 		regex_t reg;
@@ -457,10 +402,10 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 		}
 		ret = NULL;
 		targ = i->data;
-		_alpm_log(PM_LOG_DEBUG, "searching for target '%s'\n", targ);
+		_alpm_log(db->handle, PM_LOG_DEBUG, "searching for target '%s'\n", targ);
 
 		if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) {
-			RET_ERR(PM_ERR_INVALID_REGEX, NULL);
+			RET_ERR(db->handle, PM_ERR_INVALID_REGEX, NULL);
 		}
 
 		for(j = list; j; j = j->next) {
@@ -499,7 +444,7 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 			}
 
 			if(matched != NULL) {
-				_alpm_log(PM_LOG_DEBUG, "    search target '%s' matched '%s'\n",
+				_alpm_log(db->handle, PM_LOG_DEBUG, "    search target '%s' matched '%s'\n",
 				          targ, matched);
 				ret = alpm_list_add(ret, pkg);
 			}
@@ -520,17 +465,15 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
  */
 int _alpm_db_load_pkgcache(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
 		return -1;
 	}
 	_alpm_db_free_pkgcache(db);
 
-	_alpm_log(PM_LOG_DEBUG, "loading package cache for repository '%s'\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "loading package cache for repository '%s'\n",
 			db->treename);
 	if(db->ops->populate(db) == -1) {
-		_alpm_log(PM_LOG_DEBUG,
+		_alpm_log(db->handle, PM_LOG_DEBUG,
 				"failed to load package cache for repository '%s'\n", db->treename);
 		return -1;
 	}
@@ -541,13 +484,11 @@ int _alpm_db_load_pkgcache(pmdb_t *db)
 
 void _alpm_db_free_pkgcache(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || !db->pkgcache_loaded) {
 		return;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "freeing package cache for repository '%s'\n",
 	                        db->treename);
 
 	alpm_list_free_inner(_alpm_db_get_pkgcache(db),
@@ -560,8 +501,6 @@ void _alpm_db_free_pkgcache(pmdb_t *db)
 
 pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
 		return NULL;
 	}
@@ -572,7 +511,7 @@ pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db)
 
 	/* hmmm, still NULL ?*/
 	if(!db->pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "warning: pkgcache is NULL for db '%s'\n", db->treename);
+		_alpm_log(db->handle, PM_LOG_DEBUG, "warning: pkgcache is NULL for db '%s'\n", db->treename);
 	}
 
 	return db->pkgcache;
@@ -580,8 +519,6 @@ pmpkghash_t *_alpm_db_get_pkgcache_hash(pmdb_t *db)
 
 alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	pmpkghash_t *hash = _alpm_db_get_pkgcache_hash(db);
 
 	if(hash == NULL) {
@@ -596,8 +533,6 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg)
 {
 	pmpkg_t *newpkg;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
 		return -1;
 	}
@@ -607,7 +542,7 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg)
 		return -1;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
 						alpm_pkg_get_name(newpkg), db->treename);
 	db->pkgcache = _alpm_pkghash_add_sorted(db->pkgcache, newpkg);
 
@@ -620,19 +555,17 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
 {
 	pmpkg_t *data = NULL;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
 		return -1;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n",
 						alpm_pkg_get_name(pkg), db->treename);
 
 	db->pkgcache = _alpm_pkghash_remove(db->pkgcache, pkg, &data);
 	if(data == NULL) {
 		/* package not found */
-		_alpm_log(PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n",
+		_alpm_log(db->handle, PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n",
 							alpm_pkg_get_name(pkg), db->treename);
 		return -1;
 	}
@@ -646,15 +579,13 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
 
 pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target)
 {
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
 		return NULL;
 	}
 
 	pmpkghash_t *pkgcache = _alpm_db_get_pkgcache_hash(db);
 	if(!pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n",
+		_alpm_log(db->handle, PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n",
 				target);
 		return NULL;
 	}
@@ -668,13 +599,11 @@ int _alpm_db_load_grpcache(pmdb_t *db)
 {
 	alpm_list_t *lp;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
 		return -1;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "loading group cache for repository '%s'\n",
 			db->treename);
 
 	for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
@@ -703,6 +632,10 @@ int _alpm_db_load_grpcache(pmdb_t *db)
 			}
 			/* we didn't find the group, so create a new one with this name */
 			grp = _alpm_grp_new(grpname);
+			if(!grp) {
+				_alpm_db_free_grpcache(db);
+				return -1;
+			}
 			grp->packages = alpm_list_add(grp->packages, pkg);
 			db->grpcache = alpm_list_add(db->grpcache, grp);
 		}
@@ -716,13 +649,11 @@ void _alpm_db_free_grpcache(pmdb_t *db)
 {
 	alpm_list_t *lg;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || !db->grpcache_loaded) {
 		return;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "freeing group cache for repository '%s'\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "freeing group cache for repository '%s'\n",
 	                        db->treename);
 
 	for(lg = db->grpcache; lg; lg = lg->next) {
@@ -735,8 +666,6 @@ void _alpm_db_free_grpcache(pmdb_t *db)
 
 alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db)
 {
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
 		return NULL;
 	}
@@ -752,8 +681,6 @@ pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target)
 {
 	alpm_list_t *i;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || target == NULL || strlen(target) == 0) {
 		return NULL;
 	}