From 9c7ebe68724791f06cdde2febdf91f0472f18407 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 6 Apr 2008 20:28:43 -0500 Subject: Remove a bit more download.h pollution Kill it where it isn't absolutely necessary. Signed-off-by: Dan McGee --- lib/libalpm/db.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'lib/libalpm/db.c') diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 9bdbc7a2..e8ae11a3 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -33,7 +33,6 @@ #include #include #include -#include /* downloadLastErrString among others. kill this */ /* libalpm */ #include "db.h" @@ -254,12 +253,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) pm_errno = 0; return(1); } else if(ret == -1) { - /* we use downloadLastErrString and downloadLastErrCode here, - * error returns from libdownload */ - /* TODO we may not have used libdownload, this should change */ - _alpm_log(PM_LOG_DEBUG, "failed to sync db: %s [%d]\n", - downloadLastErrString, downloadLastErrCode); - RET_ERR(PM_ERR_DB_SYNC, -1); + /* pm_errno was set by the download code */ + _alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast()); + return(-1); } else { /* form the path to the db location */ snprintf(path, PATH_MAX, "%s%s" DBEXT, dbpath, db->treename); -- cgit v1.2.3-24-g4f1b