Imported Upstream version 17.10.1

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bfdce57..14b2ecf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,13 +154,31 @@ ELSE ( NOT ZLIB_FOUND)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 ENDIF( NOT ZLIB_FOUND)
 
-#SET(LibSolv_USE_STATIC_LIBS ON)
-FIND_PACKAGE(LibSolv REQUIRED ext)
-IF ( NOT LibSolv_FOUND )
-  MESSAGE( FATAL_ERROR " libsolv not found" )
+
+#Allow to override the libsolv install location
+IF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR )
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/libsolv
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/libsolv/include
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/libsolv/ext
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/libsolv/solvversion
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBSOLV_SRCDIR}/src ${CMAKE_BINARY_DIR}/libsolv/include/solv
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBSOLV_SRCDIR}/ext ${CMAKE_BINARY_DIR}/libsolv/ext/solv
+    COMMAND ${CMAKE_COMMAND} -E create_symlink ${LIBSOLV_BUILDDIR}/src ${CMAKE_BINARY_DIR}/libsolv/solvversion/solv
+  )
+
+  INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/libsolv/include ${CMAKE_BINARY_DIR}/libsolv/ext ${CMAKE_BINARY_DIR}/libsolv/solvversion ${CMAKE_BINARY_DIR}/libsolv/solvversion/solv ${CMAKE_BINARY_DIR}/libsolv/ext/solv ${CMAKE_BINARY_DIR}/libsolv/include/solv )
+  SET( LibSolv_LIBRARIES ${LIBSOLV_BUILDDIR}/src/libsolv.a ${LIBSOLV_BUILDDIR}/ext/libsolvext.a )
+
 ELSE()
-  INCLUDE_DIRECTORIES( ${LibSolv_INCLUDE_DIRS} )
-ENDIF()
+  FIND_PACKAGE(LibSolv REQUIRED ext)
+  #SET(LibSolv_USE_STATIC_LIBS ON)
+  IF ( NOT LibSolv_FOUND )
+    MESSAGE( FATAL_ERROR " libsolv not found" )
+  ELSE()
+    INCLUDE_DIRECTORIES( ${LibSolv_INCLUDE_DIRS} )
+  ENDIF()
+ENDIF( LIBSOLV_SRCDIR AND LIBSOLV_BUILDDIR )
 
 FIND_PACKAGE(Gpgme REQUIRED)
 IF ( NOT GPGME_PTHREAD_FOUND )

diff --git a/VERSION.cmake b/VERSION.cmake
index 557adb4..a2a8323 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "9")
 SET(LIBZYPP_MINOR "10")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
 #
-# LAST RELEASED: 17.10.0 (9)
+# LAST RELEASED: 17.10.1 (9)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 386e136..9d513b1 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Nov 28 14:40:26 CET 2018 - ma@suse.de
+
+- Adapt to changes in upcoming Boost 1.69.0
+- Do not fail service-refresh on a empty repoindex.xml (bnc#1116840)
+- version 17.10.1 (9)
+
+-------------------------------------------------------------------
 Mon Nov 26 12:14:49 CET 2018 - ma@suse.de
 
 - str: recognize 'always' and 'never' as valid boolean strings

diff --git a/zypp/TriBool.h b/zypp/TriBool.h
index aa5e7ff..f2c5cfe 100644 (file)
--- a/zypp/TriBool.h
+++ b/zypp/TriBool.h
@@ -68,7 +68,7 @@ namespace boost
 
       /** \relates TriBool whether 2 tribool have the same state (this is NOT ==) */
       inline bool sameTriboolState( tribool lhs, tribool rhs )
-      { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( lhs == rhs ) ); }
+      { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( bool )( lhs == rhs ) ); }
     }
 }
 #endif // ZYPP_TRIBOOL_H

diff --git a/zypp/repo/ServiceRepos.cc b/zypp/repo/ServiceRepos.cc
index 7869174..f82f51e 100644 (file)
--- a/zypp/repo/ServiceRepos.cc
+++ b/zypp/repo/ServiceRepos.cc
@@ -40,10 +40,19 @@ namespace zypp
        mediamanager.attach( mid );
        mediamanager.provideFile( mid, "repo/repoindex.xml" );
        Pathname path = mediamanager.localPath(mid, "repo/repoindex.xml" );
-       parser::RepoindexFileReader reader(path, callback);
-       service.setProbedTtl( reader.ttl() );   // hack! Modifying the const Service to set parsed TTL
-       mediamanager.release( mid );
-       mediamanager.close( mid );
+       try {
+         parser::RepoindexFileReader reader(path, callback);
+         service.setProbedTtl( reader.ttl() ); // hack! Modifying the const Service to set parsed TTL
+         mediamanager.release( mid );
+         mediamanager.close( mid );
+       } catch ( const Exception &e ) {
+         //Reader throws a bare exception, we need to translate it into something our calling
+         //code expects and handles (bnc#1116840)
+         ZYPP_CAUGHT ( e );
+         ServicePluginInformalException ex ( e.msg() );
+         ex.remember( e );
+         ZYPP_THROW( ex );
+       }
       }
     };