Imported Upstream version 14.45.15

diff --git a/VERSION.cmake b/VERSION.cmake
index b3c68e6..8e54dea 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "45")
-SET(LIBZYPP_PATCH "14")
+SET(LIBZYPP_PATCH "15")
 #
-# LAST RELEASED: 14.45.14 (39)
+# LAST RELEASED: 14.45.15 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index bc27655..a4fea1c 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Jul 31 12:39:10 CEST 2018 - ma@suse.de
+
+- Handle http error 502 Bad Gateway in curl backend (bsc #1070851)
+  (fixes openSUSE/zypper#177)
+- version 14.45.15 (39)
+
+-------------------------------------------------------------------
 Wed Jul 18 11:43:23 CEST 2018 - ma@suse.de
 
 - RepoManager: Explicitly request repo2solv to generate application

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index eee68c3..99a6868 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -997,6 +997,7 @@ void MediaCurl::evaluateCurlCode( const Pathname &filename,
                            ));
           }
 
+          case 502: // bad gateway (bnc #1070851)
           case 503: // service temporarily unavailable (bnc #462545)
             ZYPP_THROW(MediaTemporaryProblemException(url));
           case 504: // gateway timeout