Imported Upstream version 14.43.2

Change-Id: I3b1d7122c927ecf4f892accd6118cf26720399f1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 15e8a8e..179f5c2 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "43")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
 #
-# LAST RELEASED: 14.43.1 (39)
+# LAST RELEASED: 14.43.2 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index d3af173..1bf5bee 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Aug 10 12:20:40 CEST 2016 - ma@suse.de
+
+- Report numeric curl error if code is unrecognized (bsc#992302)
+- version 14.43.2 (39)
+
+-------------------------------------------------------------------
 Wed Jun 15 12:43:39 CEST 2016 - ma@suse.de
 
 - Fix bug in removeRepository which may keep an empty .repo file

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index 486b7bc..150856a 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -1063,7 +1063,7 @@ void MediaCurl::evaluateCurlCode( const Pathname &filename,
         break;
       case CURLE_SSL_PEER_CERTIFICATE:
       default:
-        err = "Unrecognized error";
+        err = "Curl error " + str::numstring( code );
         break;
       }