Author: jkupec Date: Wed Oct 29 14:13:32 2008 New Revision: 11535 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11535&view=rev Log: - throw a MediaTimeoutException also on http 504 (gateway timeout) (bnc #425035) Modified: trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?rev=11535&r1=11534&r2=11535&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Wed Oct 29 14:13:32 2008 @@ -492,7 +492,7 @@ disconnectFrom(); ZYPP_THROW(MediaCurlSetOptException(_url, _curlError)); } - + } @@ -1058,6 +1058,11 @@ )); } else + if (httpReturnCode == 504) // gateway timeout + { + ZYPP_THROW(MediaTimeoutException(url)); + } + else if ( httpReturnCode == 403) // access denied { ZYPP_THROW(MediaForbiddenException(url)); @@ -1282,6 +1287,11 @@ )); } else + if (httpReturnCode == 504) // gateway timeout + { + ZYPP_THROW(MediaTimeoutException(url)); + } + else if ( httpReturnCode == 403) { ZYPP_THROW(MediaForbiddenException(url)); @@ -1662,7 +1672,7 @@ string prompt_msg = boost::str(boost::format( //!\todo add comma to the message for the next release - _("Authentication required for '%s'")) % _url.asString()); + _("Authentication required for '%s'")) % _url.asString()); // set available authentication types from the exception // might be needed in prompt @@ -1684,7 +1694,7 @@ * back to repoinfo or dont store urls with username * (and either forbid more repos with the same url and different * user, or return a set of credentials from CM and try them one - * by one) + * by one) */ } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org