bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove libdownload reference from pacman frontend

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-04-06 19:58:10 -05:00
parent 404e0a0e10
commit 4004bf9caf
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/pacman/sync.c
View file

@ -29,9 +29,6 @@
#include <alpm.h> #include <alpm.h>
#include <alpm_list.h> #include <alpm_list.h>
#include <download.h> /* downloadLastErrString */
/* TODO remove above download.h inclusion once we abstract more, and also
* remove it from Makefile.am on the pacman side */
/* pacman */ /* pacman */
#include "pacman.h" #include "pacman.h"
@ -274,20 +271,8 @@ static int sync_synctree(int level, alpm_list_t *syncs)
ret = alpm_db_update((level < 2 ? 0 : 1), db); ret = alpm_db_update((level < 2 ? 0 : 1), db);
if(ret < 0) { if(ret < 0) {
if(pm_errno == PM_ERR_DB_SYNC) { fprintf(stderr, _("error: failed to update %s (%s)\n"),
/* use libdownload error */ alpm_db_get_name(db), alpm_strerrorlast());
/* TODO breaking abstraction barrier here?
* pacman -> libalpm -> libdownload
*
* Yes. This will be here until we add a nice pacman "pm_errstr" or
* something, OR add all libdownload error codes into the pm_error enum
*/
fprintf(stderr, _("error: failed to synchronize %s: %s\n"),
alpm_db_get_name(db), downloadLastErrString);
} else {
fprintf(stderr, _("error: failed to update %s (%s)\n"),
alpm_db_get_name(db), alpm_strerrorlast());
}
} else if(ret == 1) { } else if(ret == 1) {
printf(_(" %s is up to date\n"), alpm_db_get_name(db)); printf(_(" %s is up to date\n"), alpm_db_get_name(db));
success++; success++;