diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-10 20:48:36 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-12-10 20:48:36 +0100 |
| commit | 3e2f480d7ad43f565bf2253fc598c2b80a22560f (patch) | |
| tree | 9328c276084c60db8bcea258b35c9d69e9da4a3b /methods | |
| parent | fb3dc57975989a6514577569af9171732b7c5403 (diff) | |
| parent | 944b2fffc4a54fbf9329faa579592cc758915a99 (diff) | |
merged -r1887..1901 from lp:~donkult/apt/sid
Diffstat (limited to 'methods')
| -rw-r--r-- | methods/connect.cc | 4 | ||||
| -rw-r--r-- | methods/makefile | 5 |
2 files changed, 4 insertions, 5 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/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 |