From 47f5c5dc1300abab18692c1c7b8e55007d6e77ac Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 1 Nov 2016 10:34:45 +0900 Subject: [PATCH] Imported Upstream version 14.40.2 Change-Id: Iec224254f5ec70d700a2003d1a68d0041b070ccf Signed-off-by: DongHun Kwak --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ zypp/solver/detail/SATResolver.cc | 12 ++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 122a274..45e64d9 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "14") SET(LIBZYPP_COMPATMINOR "39") SET(LIBZYPP_MINOR "40") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 14.40.1 (39) +# LAST RELEASED: 14.40.2 (39) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 886061e..4d26451 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 12 18:09:22 CEST 2015 - ma@suse.de + +- Fix setting dup_allow* solver options (bnc#941463) +- version 14.40.2 (39) + +------------------------------------------------------------------- Wed Aug 12 15:49:49 CEST 2015 - ma@suse.de - Don't make zypper encode {} around repo vars (bnc#941453) diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index 961ace3..31dff06 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -485,15 +485,15 @@ SATResolver::solving(const CapabilitySet & requires_caps, solver_set_flag(_solv, SOLVER_FLAG_NO_UPDATEPROVIDE, _noupdateprovide); solver_set_flag(_solv, SOLVER_FLAG_IGNORE_RECOMMENDED, _onlyRequires); solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_DOWNGRADE, _dup_allowdowngrade ); - solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, _dup_allownamechange ); - solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE, _dup_allowarchchange ); - solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, _dup_allowvendorchange ); + solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, _dup_allownamechange ); + solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, _dup_allowarchchange ); + solver_set_flag(_solv, SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE, _dup_allowvendorchange ); #if 1 #define HACKENV(X,D) solver_set_flag(_solv, X, env::HACKENV( #X, D ) ); HACKENV( SOLVER_FLAG_DUP_ALLOW_DOWNGRADE, _dup_allowdowngrade ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, _dup_allownamechange ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE,_dup_allowarchchange ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, _dup_allowvendorchange ); + HACKENV( SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, _dup_allownamechange ); + HACKENV( SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, _dup_allowarchchange ); + HACKENV( SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE,_dup_allowvendorchange ); #undef HACKENV #endif sat::Pool::instance().prepareForSolving(); -- 2.7.4