From 6876f6574e15a6c5898ebf493b274313a4af98b1 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Mon, 18 Feb 2008 13:17:47 +0000 Subject: [PATCH] - handle error messages better in doesFileExist too which is used during probing. (bnc #362608) --- package/libzypp.changes | 6 ++++++ zypp/media/MediaCurl.cc | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/package/libzypp.changes b/package/libzypp.changes index 267db69..1a4c3c5 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 18 14:15:48 CET 2008 - dmacvicar@suse.de + +- handle error messages better in doesFileExist too which is + used during probing. (bnc #362608) + Sun Feb 17 21:44:12 CET 2008 - dmacvicar@suse.de ------------------------------------------------------------------- diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc index 161343a..94664e0 100644 --- a/zypp/media/MediaCurl.cc +++ b/zypp/media/MediaCurl.cc @@ -1014,12 +1014,20 @@ bool MediaCurl::doGetDoesFileExist( const Pathname & filename ) const case CURLE_URL_MALFORMAT_USER: case CURLE_BAD_PASSWORD_ENTERED: case CURLE_FTP_USER_PASSWORD_INCORRECT: + err = "Login failed"; + break; case CURLE_COULDNT_RESOLVE_PROXY: case CURLE_COULDNT_RESOLVE_HOST: case CURLE_COULDNT_CONNECT: case CURLE_FTP_CANT_GET_HOST: + err = "Connection failed"; + break; case CURLE_WRITE_ERROR: + err = "Write error"; + break; case CURLE_ABORTED_BY_CALLBACK: + err = "Timeout reached"; + break; case CURLE_SSL_PEER_CERTIFICATE: default: err = curl_easy_strerror(ok); -- 2.7.4