Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-05-02 16:25:47 -0500
committerDan McGee <dan@archlinux.org>2011-05-05 12:10:51 -0500
commitb14c5477e5e4483352d304a1e97de5922948b934 (patch)
tree83b9d854c9c214d697a0f816f006fa459f8b04de /lib/libalpm
parent8fd9037cfd8836db7dd35ba0e8825ba86c4e4688 (diff)
Ensure populate error return codes are consistent
It must be -1 to differentiate it from a number of packages loaded count. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/be_local.c3
-rw-r--r--lib/libalpm/be_sync.c11
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index edb62054..d5edf34c 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -384,7 +384,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 c2c62aa2..c440cd6b 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -223,8 +223,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);
@@ -232,7 +233,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);
@@ -242,10 +243,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);