Merge branch 'download'

1 files changed, 6 insertions, 13 deletions

diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index 21fbb48f..cf98cc75 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -20,21 +20,14 @@
 
 #include "config.h"
 
-/* TODO: needed for the libfetch stuff, unfortunately- we should kill it */
-#include <stdio.h>
-/* the following two are needed for FreeBSD's libfetch */
-#include <limits.h> /* PATH_MAX */
-#if defined(HAVE_SYS_PARAM_H)
-#include <sys/param.h> /* MAXHOSTNAMELEN */
-#endif
-
-#ifdef HAVE_LIBFETCH
-#include <fetch.h> /* fetchLastErrString */
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
 #endif
 
 /* libalpm */
 #include "util.h"
 #include "alpm.h"
+#include "handle.h"
 
 const char SYMEXPORT *alpm_strerrorlast(void)
 {
@@ -147,9 +140,9 @@ const char SYMEXPORT *alpm_strerror(int err)
 			 * requires the archive struct, so we can't. Just use a generic
 			 * error string instead. */
 			return _("libarchive error");
-		case PM_ERR_LIBFETCH:
-#ifdef HAVE_LIBFETCH
-			return fetchLastErrString;
+		case PM_ERR_LIBCURL:
+#ifdef HAVE_LIBCURL
+			return(curl_easy_strerror(handle->curlerr));
 #else
 			/* obviously shouldn't get here... */
 			return _("download library error");