Merge branch 'maint'

2 files changed, 8 insertions, 6 deletions

diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index bdfdb4fd..36105452 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -352,7 +352,8 @@ static int local_db_populate(pmdb_t *db)
 
 	dbpath = _alpm_db_path(db);
 	if(dbpath == NULL) {
-		RET_ERR(PM_ERR_DB_OPEN, -1);
+		/* pm_errno set in _alpm_db_path() */
+		return -1;
 	}
 	dbdir = opendir(dbpath);
 	if(dbdir == NULL) {
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index c38e232c..cd4a8667 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -246,8 +246,9 @@ static int sync_db_populate(pmdb_t *db)
 
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
-	if((archive = archive_read_new()) == NULL)
-		RET_ERR(PM_ERR_LIBARCHIVE, 1);
+	if((archive = archive_read_new()) == NULL) {
+		RET_ERR(PM_ERR_LIBARCHIVE, -1);
+	}
 
 	archive_read_support_compression_all(archive);
 	archive_read_support_format_all(archive);
@@ -255,7 +256,7 @@ static int sync_db_populate(pmdb_t *db)
 	dbpath = _alpm_db_path(db);
 	if(!dbpath) {
 		/* pm_errno set in _alpm_db_path() */
-		return 1;
+		return -1;
 	}
 
 	_alpm_log(PM_LOG_DEBUG, "opening database archive %s\n", dbpath);
@@ -265,10 +266,10 @@ static int sync_db_populate(pmdb_t *db)
 		_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
 				archive_error_string(archive));
 		archive_read_finish(archive);
-		RET_ERR(PM_ERR_DB_OPEN, 1);
+		RET_ERR(PM_ERR_DB_OPEN, -1);
 	}
 	if(stat(dbpath, &buf) != 0) {
-		RET_ERR(PM_ERR_DB_OPEN, 1);
+		RET_ERR(PM_ERR_DB_OPEN, -1);
 	}
 	est_count = estimate_package_count(&buf, archive);