diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-10 22:20:07 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-10 22:20:07 +0100 |
| commit | 43be0ac4b37f3a82ae4a16e473c3d8e44637ce1b (patch) | |
| tree | 7c0e75b291d132b6f1577fc2267f8ea0a60df459 /methods | |
| parent | 9307ef07498d37c0b5e05b036195abaf7ad0105c (diff) | |
| parent | a0895a74fe95997a5d75e5b54c95afb9594554f6 (diff) | |
merged from the mvo branch (and contains all non-abi break changes from donkult)
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/connect.cc | 4 | ||||
| -rw-r--r-- | methods/https.cc | 1 | ||||
| -rw-r--r-- | methods/makefile | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/methods/connect.cc b/methods/connect.cc index b5f48907e..74e670ebd 100644 --- a/methods/connect.cc +++ b/methods/connect.cc @@ -190,8 +190,8 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd, return _error->Error(_("Temporary failure resolving '%s'"), Host.c_str()); } - return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"), - Host.c_str(),ServStr,Res); + return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"), + Host.c_str(),ServStr,Res,gai_strerror(Res)); } break; } diff --git a/methods/https.cc b/methods/https.cc index 3717ded7b..86d7f3a6b 100644 --- a/methods/https.cc +++ b/methods/https.cc @@ -138,7 +138,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm) curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false); curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); curl_easy_setopt(curl, CURLOPT_FILETIME, true); - curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); // SSL parameters are set by default to the common (non mirror-specific) value // if available (or a default one) and gets overload by mirror-specific ones. diff --git a/methods/makefile b/methods/makefile index 134166ba3..7bcae6b9b 100644 --- a/methods/makefile +++ b/methods/makefile @@ -6,9 +6,8 @@ SUBDIR=methods include ../buildlib/defaults.mak BIN := $(BIN)/methods -# FIXME.. -LIB_APT_PKG_MAJOR = 4.8 -APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR) +include ../buildlib/libversion.mak +APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR) # The file method PROGRAM=file |