From 420383e6a5f2a78fd37e289d12c637b441f4431d Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 27 Nov 2020 15:49:15 +0900 Subject: [PATCH] Imported Upstream version 17.23.7 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ tests/lib/TestSetup.h | 2 +- tests/repo/yum/YUMDownloader_test.cc | 2 +- tools/zypp-NameReqPrv.cc | 4 ++++ zypp/repo/yum/Downloader.cc | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index b41d44a..2d7da4d 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "22") SET(LIBZYPP_MINOR "23") -SET(LIBZYPP_PATCH "6") +SET(LIBZYPP_PATCH "7") # -# LAST RELEASED: 17.23.6 (22) +# LAST RELEASED: 17.23.7 (22) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 66a4727..45a8f5b 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 23 17:44:21 CEST 2020 - ma@suse.de + +- Enable zchunk metadata download if libsolv supports it. +- version 17.23.7 (22) + +------------------------------------------------------------------- Thu Jun 4 11:45:03 CEST 2020 - ma@suse.de - Revert "Enable zchunk on SLE-15-SP2". diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index 6529bf7..88ec144 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -271,7 +271,7 @@ public: continue; // master index currently unevaluated if ( str::hasPrefix( basename, "solver-system.xml" ) ) loadTargetHelix( *it ); - else + else if ( repoi.count( basename ) ) { const RepoD & repod( repoi[basename] ); diff --git a/tests/repo/yum/YUMDownloader_test.cc b/tests/repo/yum/YUMDownloader_test.cc index a17df1f..e576ca2 100644 --- a/tests/repo/yum/YUMDownloader_test.cc +++ b/tests/repo/yum/YUMDownloader_test.cc @@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(yum_download) yum.download(media, localdir); -#if ENABLE_ZCHUNK_COMPRESSION && defined(LIBSOLVEXT_FEATURE_ZCHUNK_COMPRESSION) +#if defined(LIBSOLVEXT_FEATURE_ZCHUNK_COMPRESSION) const bool zchunk = true; #else const bool zchunk = false; diff --git a/tools/zypp-NameReqPrv.cc b/tools/zypp-NameReqPrv.cc index 6568cad..ec2c8b0 100644 --- a/tools/zypp-NameReqPrv.cc +++ b/tools/zypp-NameReqPrv.cc @@ -178,6 +178,10 @@ void dDump( const std::string & spec_r ) { message << endl << "CONTENT: " << make(el)->contents(); } + else if ( isKind(el) ) + { + message << endl << "STATUS: " << PoolItem(el); + } } message << endl << "}" << endl; } diff --git a/zypp/repo/yum/Downloader.cc b/zypp/repo/yum/Downloader.cc index 29b5031..688e414 100644 --- a/zypp/repo/yum/Downloader.cc +++ b/zypp/repo/yum/Downloader.cc @@ -105,7 +105,7 @@ namespace yum return true; // skip sqlitedb bool zchk { str::endsWith( typestr_r, "_zck" ) }; -#if ENABLE_ZCHUNK_COMPRESSION && defined(LIBSOLVEXT_FEATURE_ZCHUNK_COMPRESSION) +#if defined(LIBSOLVEXT_FEATURE_ZCHUNK_COMPRESSION) const std::string & basetype { zchk ? typestr_r.substr( 0, typestr_r.size()-4 ) : typestr_r }; #else if ( zchk ) -- 2.7.4