From d492bc6ff98c3a2917afcaad406ef9586a9ba8f5 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 11:16:29 +0900 Subject: [PATCH] Imported Upstream version 16.3.1 Change-Id: I1e7c33dab70725c0e6e7e0ece7d35c024a5d9d47 Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ zypp/Resolver.cc | 1 + zypp/Resolver.h | 5 +++++ zypp/target/TargetImpl.cc | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 5263111..dab5ac2 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") SET(LIBZYPP_MINOR "3") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 16.3.0 (0) +# LAST RELEASED: 16.3.1 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 6aa746a..5aa833d 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 11 18:04:18 CEST 2016 - ma@suse.de + +- Let 'dup --from' leave an updateTestcase- in /var/log (bsc#1004096) +- version 16.3.1 (0) + +------------------------------------------------------------------- Tue Oct 11 11:41:47 CEST 2016 - ma@suse.de - RepoInfo: Allow parsing multiple gpgkey= URLs (bsc#1003748) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index 8e10142..8c02fac 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -126,6 +126,7 @@ namespace zypp #undef ZOLV_FLAG_TRIBOOL void Resolver::addUpgradeRepo( Repository repo_r ) { _pimpl->addUpgradeRepo( repo_r ); } + bool Resolver::upgradingRepos() const { return !_pimpl->upgradeRepos().empty(); } bool Resolver::upgradingRepo( Repository repo_r ) const { return _pimpl->upgradingRepo( repo_r ); } void Resolver::removeUpgradeRepo( Repository repo_r ) { _pimpl->removeUpgradeRepo( repo_r ); } void Resolver::removeUpgradeRepos() { _pimpl->removeUpgradeRepos(); } diff --git a/zypp/Resolver.h b/zypp/Resolver.h index c7ebb09..aaeffbe 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -286,6 +286,11 @@ namespace zypp void addUpgradeRepo( Repository repo_r ); /** + * Whether there is at least one \c UpgradeRepo request pending + */ + bool upgradingRepos() const; + + /** * Whether there is an \c UpgradeRepo request pending for this repo. */ bool upgradingRepo( Repository repo_r ) const; diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index bcc7661..baffb9b 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -1152,7 +1152,7 @@ namespace zypp /////////////////////////////////////////////////////////////////// // Write out a testcase if we're in dist upgrade mode. /////////////////////////////////////////////////////////////////// - if ( getZYpp()->resolver()->upgradeMode() ) + if ( pool_r.resolver().upgradeMode() || pool_r.resolver().upgradingRepos() ) { if ( ! policy_r.dryRun() ) { -- 2.7.4