moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-12 04:15:06 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2011-05-05 13:25:10 -05:00
commit 6b308d89f9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libalpm/be_local.c
View File

@ -352,7 +352,8 @@ static int local_db_populate(pmdb_t *db)
dbpath = _alpm_db_path(db); dbpath = _alpm_db_path(db);
if(dbpath == NULL) { if(dbpath == NULL) {
RET_ERR(PM_ERR_DB_OPEN, -1); /* pm_errno set in _alpm_db_path() */
return -1;
} }
dbdir = opendir(dbpath); dbdir = opendir(dbpath);
if(dbdir == NULL) { if(dbdir == NULL) {

11
lib/libalpm/be_sync.c
View File

@ -246,8 +246,9 @@ static int sync_db_populate(pmdb_t *db)
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
if((archive = archive_read_new()) == NULL) if((archive = archive_read_new()) == NULL) {
RET_ERR(PM_ERR_LIBARCHIVE, 1); RET_ERR(PM_ERR_LIBARCHIVE, -1);
}
archive_read_support_compression_all(archive); archive_read_support_compression_all(archive);
archive_read_support_format_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); dbpath = _alpm_db_path(db);
if(!dbpath) { if(!dbpath) {
/* pm_errno set in _alpm_db_path() */ /* pm_errno set in _alpm_db_path() */
return 1; return -1;
} }
_alpm_log(PM_LOG_DEBUG, "opening database archive %s\n", dbpath); _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, _alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
archive_error_string(archive)); archive_error_string(archive));
archive_read_finish(archive); archive_read_finish(archive);
RET_ERR(PM_ERR_DB_OPEN, 1); RET_ERR(PM_ERR_DB_OPEN, -1);
} }
if(stat(dbpath, &buf) != 0) { 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); est_count = estimate_package_count(&buf, archive);