From e7df77d3f25679515f05aba52f358389f74de9af Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 10:40:25 +0900 Subject: [PATCH] Imported Upstream version 14.44.1 Change-Id: I4166425e068463bd4c203a41d76ef3600481148d 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 a4c5475..a23ef41 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "39") SET(LIBZYPP_MINOR "44") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 14.44.0 (39) +# LAST RELEASED: 14.44.1 (39) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index c29d55a..8f63bc7 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 11 18:07:13 CEST 2016 - ma@suse.de + +- Let 'dup --from' leave an updateTestcase- in /var/log (bsc#1004096) +- version 14.44.1 (39) + +------------------------------------------------------------------- Tue Oct 11 12:32:32 CEST 2016 - ma@suse.de - RepoInfo: Allow parsing multiple gpgkey= URLs (bsc#1003748) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index f4bb1dc..6092660 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -123,6 +123,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 dd71fd2..f2ef092 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -280,6 +280,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 2230d86..1a8a803 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -1136,7 +1136,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