September 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> SuSE-Code-11-Branch : changes 5.30.13
by Michael Andres 29 Sep '09

29 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit 003d1d4cf67d9190a4aa24a56aeba04a1cb16a86 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 29 18:33:07 2009 +0200 changes 5.30.13 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index aa3140c..cf893bc 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -51,8 +51,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "30") -SET(LIBZYPP_PATCH "12") +SET(LIBZYPP_PATCH "13") # -# LAST RELEASED: 5.30.12 (23) +# LAST RELEASED: 5.30.13 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index b75d4d3..c373a56 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 29 18:28:25 CEST 2009 - ma(a)suse.de + +- Avoid SEGV if trying to access data of installed packages, that were + deleted behind our back (bnc #530595) +- version 5.30.13 (23) + +------------------------------------------------------------------- Tue Sep 22 20:52:23 CEST 2009 - ma(a)suse.de - Add Selectable::updateCandidateObj returning the candidate for -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> SuSE-Code-11-Branch : Fix crash accessing data of installed packages, that were deleted behind our back (bnc #530595)
by Michael Andres 29 Sep '09

29 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit 83888fe0f2584581b12369813b8923fc1f99ddec Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 29 18:32:53 2009 +0200 Fix crash accessing data of installed packages, that were deleted behind our back (bnc #530595) --- zypp/Package.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/Package.cc b/zypp/Package.cc index 3263a94..0db54af 100644 --- a/zypp/Package.cc +++ b/zypp/Package.cc @@ -85,7 +85,7 @@ namespace zypp { target::rpm::RpmHeader::constPtr header; target->rpmDb().getData(name(), header); - return header->tag_changelog(); + return header ? header->tag_changelog() : Changelog(); // might be deleted behind our back (bnc u530595) } WAR << "changelog is not available for uninstalled packages" << std::endl; return Changelog(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : update testcase
by Michael Andres 29 Sep '09

29 Sep '09

ref: refs/heads/master commit fb153ed21efa4b08d6d432e05240f5dd37667d41 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 29 13:43:59 2009 +0200 update testcase --- tests/zypp/Selectable_test.cc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/zypp/Selectable_test.cc b/tests/zypp/Selectable_test.cc index 5c80d5f..a878f42 100644 --- a/tests/zypp/Selectable_test.cc +++ b/tests/zypp/Selectable_test.cc @@ -10,12 +10,12 @@ static TestSetup test; BOOST_AUTO_TEST_CASE(testcase_init) { - zypp::base::LogControl::instance().logToStdErr(); +// zypp::base::LogControl::instance().logToStdErr(); test.loadTestcaseRepos( TESTS_SRC_DIR"/data/TCSelectable" ); -/* dumpRange( USR, test.pool().knownRepositoriesBegin(), - test.pool().knownRepositoriesEnd() ) << endl; - USR << "pool: " << test.pool() << endl;*/ +// dumpRange( USR, test.pool().knownRepositoriesBegin(), +// test.pool().knownRepositoriesEnd() ) << endl; +// USR << "pool: " << test.pool() << endl; } ///////////////////////////////////////////////////////////////////////////// @@ -35,6 +35,7 @@ BOOST_AUTO_TEST_CASE(candiadate) // } BOOST_CHECK_EQUAL( s->candidateObj()->repoInfo().alias(), "RepoMID" ); BOOST_CHECK_EQUAL( s->candidateObj()->edition(), Edition("0-1") ); + BOOST_CHECK_EQUAL( s->candidateObj()->arch(), Arch_i586 ); // no updateCandidate due to low version BOOST_CHECK_EQUAL( s->updateCandidateObj(), PoolItem() ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : update testcase
by Michael Andres 29 Sep '09

29 Sep '09

ref: refs/heads/ma-misc commit fb153ed21efa4b08d6d432e05240f5dd37667d41 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 29 13:43:59 2009 +0200 update testcase --- tests/zypp/Selectable_test.cc | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/zypp/Selectable_test.cc b/tests/zypp/Selectable_test.cc index 5c80d5f..a878f42 100644 --- a/tests/zypp/Selectable_test.cc +++ b/tests/zypp/Selectable_test.cc @@ -10,12 +10,12 @@ static TestSetup test; BOOST_AUTO_TEST_CASE(testcase_init) { - zypp::base::LogControl::instance().logToStdErr(); +// zypp::base::LogControl::instance().logToStdErr(); test.loadTestcaseRepos( TESTS_SRC_DIR"/data/TCSelectable" ); -/* dumpRange( USR, test.pool().knownRepositoriesBegin(), - test.pool().knownRepositoriesEnd() ) << endl; - USR << "pool: " << test.pool() << endl;*/ +// dumpRange( USR, test.pool().knownRepositoriesBegin(), +// test.pool().knownRepositoriesEnd() ) << endl; +// USR << "pool: " << test.pool() << endl; } ///////////////////////////////////////////////////////////////////////////// @@ -35,6 +35,7 @@ BOOST_AUTO_TEST_CASE(candiadate) // } BOOST_CHECK_EQUAL( s->candidateObj()->repoInfo().alias(), "RepoMID" ); BOOST_CHECK_EQUAL( s->candidateObj()->edition(), Edition("0-1") ); + BOOST_CHECK_EQUAL( s->candidateObj()->arch(), Arch_i586 ); // no updateCandidate due to low version BOOST_CHECK_EQUAL( s->updateCandidateObj(), PoolItem() ); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Add Selectable testcase
by Michael Andres 29 Sep '09

29 Sep '09

ref: refs/heads/master commit 06d13b6294c87073101e830e77fbb0b63250c8d6 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 29 13:31:39 2009 +0200 Add Selectable testcase --- tests/data/TCSelectable/RepoHIGH.xml | 20 ++++++++++++++ tests/data/TCSelectable/RepoLOW.xml | 20 ++++++++++++++ tests/data/TCSelectable/RepoMID.xml | 20 ++++++++++++++ tests/data/TCSelectable/solver-system.xml | 11 ++++++++ tests/data/TCSelectable/solver-test.xml | 23 ++++++++++++++++ tests/zypp/CMakeLists.txt | 1 + tests/zypp/Selectable_test.cc | 40 +++++++++++++++++++++++++++++ 7 files changed, 135 insertions(+), 0 deletions(-) diff --git a/tests/data/TCSelectable/RepoHIGH.xml b/tests/data/TCSelectable/RepoHIGH.xml new file mode 100644 index 0000000..6cfccd6 --- /dev/null +++ b/tests/data/TCSelectable/RepoHIGH.xml @@ -0,0 +1,20 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>unkown</vendor> + <history><update> + <arch>x86_64</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidate</name> + <vendor>unkown</vendor> + <history><update> + <arch>i586</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/RepoLOW.xml b/tests/data/TCSelectable/RepoLOW.xml new file mode 100644 index 0000000..71f335a --- /dev/null +++ b/tests/data/TCSelectable/RepoLOW.xml @@ -0,0 +1,20 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>x86_64</arch> + <version>2</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidate</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>i586</arch> + <version>2</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/RepoMID.xml b/tests/data/TCSelectable/RepoMID.xml new file mode 100644 index 0000000..f1b6d1d --- /dev/null +++ b/tests/data/TCSelectable/RepoMID.xml @@ -0,0 +1,20 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>SUSE</vendor> + <history><update> + <arch>x86_64</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidate</name> + <vendor>SUSE</vendor> + <history><update> + <arch>i586</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/solver-system.xml b/tests/data/TCSelectable/solver-system.xml new file mode 100644 index 0000000..4fe7341 --- /dev/null +++ b/tests/data/TCSelectable/solver-system.xml @@ -0,0 +1,11 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>i586</arch> + <version>1</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/solver-test.xml b/tests/data/TCSelectable/solver-test.xml new file mode 100644 index 0000000..64a28d4 --- /dev/null +++ b/tests/data/TCSelectable/solver-test.xml @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<test> +<setup arch="x86_64"> + <system file="solver-system.xml"/> +  + <channel file="RepoHIGH.xml" name="RepoHIGH" priority="10" /> +  + <channel file="RepoMID.xml" name="RepoMID" priority="50" /> +  + <channel file="RepoLOW.xml" name="RepoLOW" priority="99" /> + <locale name="en_US" /> + <locale name="de" /> +</setup> +</test> diff --git a/tests/zypp/CMakeLists.txt b/tests/zypp/CMakeLists.txt index ed43863..a4a2495 100644 --- a/tests/zypp/CMakeLists.txt +++ b/tests/zypp/CMakeLists.txt @@ -29,6 +29,7 @@ ADD_TESTS( RepoStatus ResKind ResStatus + Selectable Target Url Vendor diff --git a/tests/zypp/Selectable_test.cc b/tests/zypp/Selectable_test.cc new file mode 100644 index 0000000..5c80d5f --- /dev/null +++ b/tests/zypp/Selectable_test.cc @@ -0,0 +1,40 @@ +#include "TestSetup.h" +#include "zypp/ResPool.h" +#include "zypp/ui/Selectable.h" + +#define BOOST_TEST_MODULE Selectable + +///////////////////////////////////////////////////////////////////////////// + +static TestSetup test; + +BOOST_AUTO_TEST_CASE(testcase_init) +{ + zypp::base::LogControl::instance().logToStdErr(); + test.loadTestcaseRepos( TESTS_SRC_DIR"/data/TCSelectable" ); + +/* dumpRange( USR, test.pool().knownRepositoriesBegin(), + test.pool().knownRepositoriesEnd() ) << endl; + USR << "pool: " << test.pool() << endl;*/ +} +///////////////////////////////////////////////////////////////////////////// + +BOOST_AUTO_TEST_CASE(candiadate) +{ + ResPoolProxy poolProxy( test.poolProxy() ); + ui::Selectable::Ptr s( poolProxy.lookup( ResKind::package, "candidate" ) ); + // (I 1) { + // I__s_(8)candidate-1-1.i586(@System)(openSUSE) + // } (A 6) { + // U__s_(2)candidate-4-1.x86_64(RepoHIGH)(unkown) + // U__s_(3)candidate-4-1.i586(RepoHIGH)(unkown) + // U__s_(6)candidate-0-1.x86_64(RepoMID)(SUSE) + // U__s_(7)candidate-0-1.i586(RepoMID)(SUSE) <- candidate (highrst prio matching arch and vendor) + // U__s_(4)candidate-2-1.x86_64(RepoLOW)(openSUSE) + // U__s_(5)candidate-2-1.i586(RepoLOW)(openSUSE) + // } + BOOST_CHECK_EQUAL( s->candidateObj()->repoInfo().alias(), "RepoMID" ); + BOOST_CHECK_EQUAL( s->candidateObj()->edition(), Edition("0-1") ); + // no updateCandidate due to low version + BOOST_CHECK_EQUAL( s->updateCandidateObj(), PoolItem() ); +} -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Add Selectable testcase
by Michael Andres 29 Sep '09

29 Sep '09

ref: refs/heads/ma-misc commit 06d13b6294c87073101e830e77fbb0b63250c8d6 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 29 13:31:39 2009 +0200 Add Selectable testcase --- tests/data/TCSelectable/RepoHIGH.xml | 20 ++++++++++++++ tests/data/TCSelectable/RepoLOW.xml | 20 ++++++++++++++ tests/data/TCSelectable/RepoMID.xml | 20 ++++++++++++++ tests/data/TCSelectable/solver-system.xml | 11 ++++++++ tests/data/TCSelectable/solver-test.xml | 23 ++++++++++++++++ tests/zypp/CMakeLists.txt | 1 + tests/zypp/Selectable_test.cc | 40 +++++++++++++++++++++++++++++ 7 files changed, 135 insertions(+), 0 deletions(-) diff --git a/tests/data/TCSelectable/RepoHIGH.xml b/tests/data/TCSelectable/RepoHIGH.xml new file mode 100644 index 0000000..6cfccd6 --- /dev/null +++ b/tests/data/TCSelectable/RepoHIGH.xml @@ -0,0 +1,20 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>unkown</vendor> + <history><update> + <arch>x86_64</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidate</name> + <vendor>unkown</vendor> + <history><update> + <arch>i586</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/RepoLOW.xml b/tests/data/TCSelectable/RepoLOW.xml new file mode 100644 index 0000000..71f335a --- /dev/null +++ b/tests/data/TCSelectable/RepoLOW.xml @@ -0,0 +1,20 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>x86_64</arch> + <version>2</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidate</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>i586</arch> + <version>2</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/RepoMID.xml b/tests/data/TCSelectable/RepoMID.xml new file mode 100644 index 0000000..f1b6d1d --- /dev/null +++ b/tests/data/TCSelectable/RepoMID.xml @@ -0,0 +1,20 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>SUSE</vendor> + <history><update> + <arch>x86_64</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidate</name> + <vendor>SUSE</vendor> + <history><update> + <arch>i586</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/solver-system.xml b/tests/data/TCSelectable/solver-system.xml new file mode 100644 index 0000000..4fe7341 --- /dev/null +++ b/tests/data/TCSelectable/solver-system.xml @@ -0,0 +1,11 @@ +<channel><subchannel> +<package> + <name>candidate</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>i586</arch> + <version>1</version> + <release>1</release> + </update></history> +</package> +</subchannel></channel> diff --git a/tests/data/TCSelectable/solver-test.xml b/tests/data/TCSelectable/solver-test.xml new file mode 100644 index 0000000..64a28d4 --- /dev/null +++ b/tests/data/TCSelectable/solver-test.xml @@ -0,0 +1,23 @@ +<?xml version="1.0"?> +<test> +<setup arch="x86_64"> + <system file="solver-system.xml"/> +  + <channel file="RepoHIGH.xml" name="RepoHIGH" priority="10" /> +  + <channel file="RepoMID.xml" name="RepoMID" priority="50" /> +  + <channel file="RepoLOW.xml" name="RepoLOW" priority="99" /> + <locale name="en_US" /> + <locale name="de" /> +</setup> +</test> diff --git a/tests/zypp/CMakeLists.txt b/tests/zypp/CMakeLists.txt index ed43863..a4a2495 100644 --- a/tests/zypp/CMakeLists.txt +++ b/tests/zypp/CMakeLists.txt @@ -29,6 +29,7 @@ ADD_TESTS( RepoStatus ResKind ResStatus + Selectable Target Url Vendor diff --git a/tests/zypp/Selectable_test.cc b/tests/zypp/Selectable_test.cc new file mode 100644 index 0000000..5c80d5f --- /dev/null +++ b/tests/zypp/Selectable_test.cc @@ -0,0 +1,40 @@ +#include "TestSetup.h" +#include "zypp/ResPool.h" +#include "zypp/ui/Selectable.h" + +#define BOOST_TEST_MODULE Selectable + +///////////////////////////////////////////////////////////////////////////// + +static TestSetup test; + +BOOST_AUTO_TEST_CASE(testcase_init) +{ + zypp::base::LogControl::instance().logToStdErr(); + test.loadTestcaseRepos( TESTS_SRC_DIR"/data/TCSelectable" ); + +/* dumpRange( USR, test.pool().knownRepositoriesBegin(), + test.pool().knownRepositoriesEnd() ) << endl; + USR << "pool: " << test.pool() << endl;*/ +} +///////////////////////////////////////////////////////////////////////////// + +BOOST_AUTO_TEST_CASE(candiadate) +{ + ResPoolProxy poolProxy( test.poolProxy() ); + ui::Selectable::Ptr s( poolProxy.lookup( ResKind::package, "candidate" ) ); + // (I 1) { + // I__s_(8)candidate-1-1.i586(@System)(openSUSE) + // } (A 6) { + // U__s_(2)candidate-4-1.x86_64(RepoHIGH)(unkown) + // U__s_(3)candidate-4-1.i586(RepoHIGH)(unkown) + // U__s_(6)candidate-0-1.x86_64(RepoMID)(SUSE) + // U__s_(7)candidate-0-1.i586(RepoMID)(SUSE) <- candidate (highrst prio matching arch and vendor) + // U__s_(4)candidate-2-1.x86_64(RepoLOW)(openSUSE) + // U__s_(5)candidate-2-1.i586(RepoLOW)(openSUSE) + // } + BOOST_CHECK_EQUAL( s->candidateObj()->repoInfo().alias(), "RepoMID" ); + BOOST_CHECK_EQUAL( s->candidateObj()->edition(), Edition("0-1") ); + // no updateCandidate due to low version + BOOST_CHECK_EQUAL( s->updateCandidateObj(), PoolItem() ); +} -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : changes
by Ján Kupec 29 Sep '09

29 Sep '09

ref: refs/heads/master commit ef1f41f67596d3f807973f9ae59c953b41a5a0aa Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Sep 29 13:16:15 2009 +0200 changes --- VERSION.cmake | 2 +- package/zypper.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index b9580da..62ee625 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -33,5 +33,5 @@ SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") SET(VERSION_PATCH "5") -# LAST RELEASED: 1.2.4 +# LAST RELEASED: 1.2.5 #======= diff --git a/package/zypper.changes b/package/zypper.changes index 895fc11..5f70cb5 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 29 13:11:54 CEST 2009 - jkupec(a)suse.cz + +- Fixed wrong update candidate selection (bnc #539360) +- Translations updated +- 1.2.5 + +------------------------------------------------------------------- Wed Sep 23 13:33:48 CEST 2009 - jkupec(a)suse.cz - Fixed troubleshooting wiki link (bnc #533606) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Replaced deprecated findUpdateItem with zypp::ui::Selectable::updateCandidateObj
by Ján Kupec 28 Sep '09

28 Sep '09

ref: refs/heads/master commit 259c83e196277137097ae5fbeeb2c48d8fbaaf2f Author: Ján Kupec <jkupec(a)suse.cz> Date: Mon Sep 28 16:12:43 2009 +0200 Replaced deprecated findUpdateItem with zypp::ui::Selectable::updateCandidateObj --- src/info.cc | 10 ++---- src/install.cc | 37 ++++++++----------- src/update.cc | 107 +++++-------------------------------------------------- src/update.h | 21 ----------- 4 files changed, 29 insertions(+), 146 deletions(-) diff --git a/src/info.cc b/src/info.cc index 92ff694..dc4a043 100644 --- a/src/info.cc +++ b/src/info.cc @@ -33,7 +33,6 @@ using boost::format; extern ZYpp::Ptr God; -#define USE_THE_ONE 0 void printNVA(const ResObject::constPtr & res) { @@ -171,12 +170,9 @@ Copy and modify /usr/share/vim/current/gvimrc to ~/.gvimrc if needed. void printPkgInfo(Zypper & zypper, const ui::Selectable & s) { PoolItem installed = s.installedObj(); - -#if USE_THE_ONE - PoolItem theone = s.theObj(); -#else - PoolItem theone = findTheBest(God->pool(), s); -#endif + PoolItem theone = s.updateCandidateObj(); + if (!theone) + theone = installed; cout << (zypper.globalOpts().is_rug_compatible ? _("Catalog: ") : _("Repository: ")) << theone.resolvable()->repository().info().name() << endl; diff --git a/src/install.cc b/src/install.cc index a9b3240..2cb9482 100755 --- a/src/install.cc +++ b/src/install.cc @@ -19,8 +19,6 @@ using namespace boost; extern ZYpp::Ptr God; -/** Use ui::Selectable::theObj() or candidateObj() */ -#define USE_THE_ONE 0 static PoolItem findInstalledItemInRepos(const PoolItem & installed) { @@ -32,7 +30,7 @@ static PoolItem findInstalledItemInRepos(const PoolItem & installed) filter::SameItemAs(installed), resfilter::ByUninstalled()), functor::getFirst(result)); - INT << "findInstalledItemInRepos(" << installed << ") => " << result << endl; + XXX << "findInstalledItemInRepos(" << installed << ") => " << result << endl; return result; } @@ -79,20 +77,13 @@ mark_for_install(Zypper & zypper, ui::Selectable::Ptr s = *q.selectableBegin(); DBG << "... done" << endl; -/* - for_(it, s->installedBegin(), s->installedEnd()) - { cout << *it << endl; } - for_(it, s->availableBegin(), s->availableEnd()) - { cout << *it << endl; } -*/ + bool force = copts.count("force"); -#if USE_THE_ONE - PoolItem candidate = s->candidateObj(); -#else - PoolItem candidate = findTheBest(God->pool(), *s); -#endif + PoolItem candidate = s->updateCandidateObj(); + if (!candidate) + candidate = s->installedObj(); if (s->installedObj() && equalNVRA(*s->installedObj().resolvable(), *candidate.resolvable()) && @@ -300,11 +291,9 @@ mark_selectable(Zypper & zypper, const string & repo = "", const string & arch = "") { -#if USE_THE_ONE - PoolItem theone = s.theObj(); -#else - PoolItem theone = findTheBest(God->pool(), s); -#endif + PoolItem theone = s.updateCandidateObj(); + if (!theone) + theone = s.installedObj(); DBG << "the One: " << theone << endl; @@ -373,7 +362,7 @@ mark_selectable(Zypper & zypper, { if (theoneinstalled && !force) { - DBG << "the One (" << theone << ") is installed, skipping." << endl; + DBG << "the One (" << theone << ") is already installed, skipping." << endl; zypper.out().info(str::form( _("'%s' is already installed."), s.name().c_str())); return; @@ -395,7 +384,13 @@ mark_selectable(Zypper & zypper, //! could be a problem for patches if there would a greater version //! of a patch appear that would be irrelevant at the same time. Should - //! happen probably. + //! not happen usually. + + //! this causes bnc #539360 if wrong update candidate is found + //! this request installation of installed > installed_version, which + //! can drag in a package with higher version even from repo with lower + //! priority + //! hopefully using ui::Selectable::updateCandidateObj() will fix this if (anyinstalled) c = Capability(s.name(), Rel::GT, installed->edition(), s.kind()); // require any version diff --git a/src/update.cc b/src/update.cc index 606f9a8..8817910 100755 --- a/src/update.cc +++ b/src/update.cc @@ -300,89 +300,6 @@ public: // ---------------------------------------------------------------------------- -// does not allow changing the arch (#222140) -// except noarch->any or any->noarch (bnc #483179) -// TODO: ignores priority (bnc #464458) -// TODO: move to libzypp -PoolItem -findUpdateItem( const ResPool & pool, const PoolItem item ) -{ - SaveBetterEdition info; - - // look for the same arch, best version - invokeOnEach( pool.byIdentBegin(item->kind(), item->name()), - pool.byIdentEnd(item->kind(), item->name()), - // get uninstalled, equal kind and arch, better edition - functor::chain( - functor::chain( - resfilter::ByUninstalled(), - resfilter::byArch<CompareByEQ<Arch> >(item->arch())), - resfilter::byEdition<CompareByGT<Edition> >(item->edition())), - functor::functorRef<bool,PoolItem>(info)); - - // the item is noarch, look for best arch, best version - // (noarch -> any is allowed) (bnc #483179) - if (item->arch() == Arch_noarch) - { - SaveBetterEditionArch bestEA; - invokeOnEach( pool.byIdentBegin(item->kind(), item->name()), - pool.byIdentEnd(item->kind(), item->name()), - // get uninstalled, equal kind, better edition - functor::chain( - resfilter::ByUninstalled(), - resfilter::byEdition<CompareByGT<Edition> >(item->edition())), - functor::functorRef<bool,PoolItem>(bestEA)); - if (bestEA.best) - { - if (!info.best) - info.best = bestEA.best; - if (info.best->arch().compare(bestEA.best->arch()) < 0) - info.best = bestEA.best; - } - } - // the item is not noarch & no update found so far - try looking for a noarch - // package (any -> noarch is allowed) (bnc #483179) - else if (!info.best) - { - invokeOnEach( pool.byIdentBegin(item->kind(), item->name()), - pool.byIdentEnd(item->kind(), item->name()), - // get uninstalled, equal kind and arch, better edition - functor::chain( - functor::chain( - resfilter::ByUninstalled(), - resfilter::byArch<CompareByEQ<Arch> >(Arch_noarch)), - resfilter::byEdition<CompareByGT<Edition> >(item->edition())), - functor::functorRef<bool,PoolItem>(info)); - } - - XXX << "findUpdateItem(" << item << ") => " << info.best; - return info.best; -} - -PoolItem -findTheBest( const ResPool & pool, const ui::Selectable & s) -{ - PoolItem theone; - if (s.installedEmpty()) - //! FIXME this will pick a random arch - should pick the system arch, or - //! the best compatible. - theone = findUpdateItem(God->pool(), *s.availableBegin()); - else - theone = findUpdateItem(God->pool(), *s.installedBegin()); - - if (!theone) - { - if (s.installedEmpty()) - theone = *s.availableBegin(); - else - theone = *s.installedBegin(); - } - - return theone; -} - -// ---------------------------------------------------------------------------- - /** * Find all available updates of given kind. */ @@ -407,20 +324,18 @@ find_updates( const ResKind & kind, Candidates & candidates ) return; } - ResPool::byKind_iterator - it = pool.byKindBegin (kind), - e = pool.byKindEnd (kind); - for (; it != e; ++it) + + for_(it, pool.proxy().byKindBegin(kind), pool.proxy().byKindEnd(kind)) { - if (it->status().isUninstalled()) + if ((*it)->hasInstalledObj()) continue; - PoolItem candidate = findUpdateItem( pool, *it ); - if (!candidate.resolvable()) + PoolItem candidate = (*it)->updateCandidateObj(); + if (!candidate) continue; - DBG << "item " << *it << endl; - DBG << "cand " << candidate << endl; + DBG << "selectable: " << **it << endl; + DBG << "candidate: " << candidate << endl; candidates.insert (candidate); } } @@ -813,11 +728,9 @@ void mark_updates(Zypper & zypper, const ResKindSet & kinds, bool skip_interacti for_(solvit, q.selectableBegin(), q.selectableEnd()) { ui::Selectable::Ptr s = *solvit; -#if USE_THE_ONE - PoolItem theone = s.theObj(); -#else - PoolItem theone = findTheBest(God->pool(), *s); -#endif + PoolItem theone = s->updateCandidateObj(); + if (!theone) + theone = s->installedObj(); if (equalNVRA(*s->installedObj().resolvable(), *theone.resolvable())) { diff --git a/src/update.h b/src/update.h index 2f4c8b1..9f6a734 100755 --- a/src/update.h +++ b/src/update.h @@ -47,24 +47,3 @@ void mark_updates(Zypper & zypper, * in --cve or --bugzilla or --bz. */ void mark_updates_by_issue(Zypper & zypper); - -/** - * Find best (according to edition) uninstalled item - * with same kind/name/arch as \a item. - * - * Similar to zypp::solver::detail::Helper::findUpdateItem() - * but allows changing the vendor and does not allow chaning arch. - */ -# warning get rid of findUpdateItem, make new API in zypp -zypp::PoolItem findUpdateItem(const zypp::ResPool & pool, const zypp::PoolItem item); - -/** - * Finds the best object in the Selectable. - * - * \todo FIXME if there is no installed object in the selectable, it chooses - * a random arch from the available objects (the availableBegin()). Choose - * the best compatible instead. - * \todo All of this should be done in libzypp, using defined policies. - */ -# warning get rid of findTheBest, make new API in zypp -zypp::PoolItem findTheBest( const zypp::ResPool & pool, const zypp::ui::Selectable & s); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> SuSE-Code-11-Branch : changes & version & require new zypp & typo fix
by Ján Kupec 25 Sep '09

25 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit 24b99610a185e92eb47f7bc5a163e1ea5794412f Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Sep 25 19:34:23 2009 +0200 changes & version & require new zypp & typo fix --- VERSION.cmake | 4 ++-- doc/zypper.8 | 2 +- package/zypper.changes | 6 ++++++ src/update.cc | 4 ++-- zypper.spec.cmake | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index a57fe65..5bfd462 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "11") +SET(VERSION_PATCH "12") -# LAST RELEASED: 1.0.11 +# LAST RELEASED: 1.0.12 #======= diff --git a/doc/zypper.8 b/doc/zypper.8 index bff2c4e..8150eb9 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "1.0.7" "zypper" "System Tools" +.TH "zypper" "8" "1.0.12" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] diff --git a/package/zypper.changes b/package/zypper.changes index df91aef..1c5a924 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 25 18:36:02 CEST 2009 - jkupec(a)suse.cz + +- Fixed incorrect selection of update candidate (bnc #539360) +- 1.0.12 + +------------------------------------------------------------------- Thu Sep 3 16:30:13 CEST 2009 - jkupec(a)suse.cz - Fixed wrong table column width computation causing excessive diff --git a/src/update.cc b/src/update.cc index 1c79ab1..fffda38 100755 --- a/src/update.cc +++ b/src/update.cc @@ -721,11 +721,11 @@ void mark_updates(Zypper & zypper, const ResKindSet & kinds, bool skip_interacti { ui::Selectable::Ptr s = *solvit; #if USE_THE_ONE - PoolItem theone = s.updateCandidateObj(); + PoolItem theone = s->updateCandidateObj(); // if there's no update candidate, then there must be an installed object // otherwise there would be no selectable of this name & kind if (!theone) - theone = s.installedObj(); + theone = s->installedObj(); #else PoolItem theone = findTheBest(God->pool(), *s); #endif diff --git a/zypper.spec.cmake b/zypper.spec.cmake index 6b8592b..95c1cf9 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 5.24.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 5.30.12 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> SuSE-Code-11-Branch : Fixed incorrect selection of update candidate (bnc #539360)
by Ján Kupec 25 Sep '09

25 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit f4367b3cdc5e454f6d695b3d3db13d6f0ce43e54 Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Sep 25 18:34:04 2009 +0200 Fixed incorrect selection of update candidate (bnc #539360) - uses new zypp::ui::Selectable::updateCandidateObj() method instead of zypper's findTheBest which ignored repo priorities and vendors --- src/info.cc | 9 +++++++-- src/install.cc | 16 ++++++++++++---- src/update.cc | 8 +++++++- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/info.cc b/src/info.cc index a6a3e8c..db733d1 100644 --- a/src/info.cc +++ b/src/info.cc @@ -33,7 +33,8 @@ using boost::format; extern ZYpp::Ptr God; -#define USE_THE_ONE 0 +/** Use ui::Selectable::updateCandidateObj() */ +#define USE_THE_ONE 1 void printNVA(const ResObject::constPtr & res) { @@ -153,7 +154,11 @@ void printPkgInfo(Zypper & zypper, const ui::Selectable & s) PoolItem installed = s.installedObj(); #if USE_THE_ONE - PoolItem theone = s.theObj(); + PoolItem theone = s.updateCandidateObj(); + // if there's no update candidate, then there must be an installed object + // otherwise there would be no selectable of this name & kind + if (!theone) + theone = installed; #else PoolItem theone = findTheBest(God->pool(), s); #endif diff --git a/src/install.cc b/src/install.cc index 8b72666..5b48e6b 100755 --- a/src/install.cc +++ b/src/install.cc @@ -19,8 +19,8 @@ using namespace boost; extern ZYpp::Ptr God; -/** Use ui::Selectable::theObj() or candidateObj() */ -#define USE_THE_ONE 0 +/** Use ui::Selectable::updateCandidateObj() */ +#define USE_THE_ONE 1 static PoolItem findInstalledItemInRepos(const PoolItem & installed) { @@ -89,7 +89,11 @@ mark_for_install(Zypper & zypper, #if USE_THE_ONE - PoolItem candidate = s->candidateObj(); + PoolItem candidate = s->updateCandidateObj(); + // if there's no update candidate, then there must be an installed object + // otherwise there would be no selectable of this name & kind + if (!candidate) + candidate = s->installedObj(); #else PoolItem candidate = findTheBest(God->pool(), *s); #endif @@ -301,7 +305,11 @@ mark_selectable(Zypper & zypper, const string & arch = "") { #if USE_THE_ONE - PoolItem theone = s.theObj(); + PoolItem theone = s.updateCandidateObj(); + // if there's no update candidate, then there must be an installed object + // otherwise there would be no selectable of this name & kind + if (!theone) + theone = s.installedObj(); #else PoolItem theone = findTheBest(God->pool(), s); #endif diff --git a/src/update.cc b/src/update.cc index edeadfb..1c79ab1 100755 --- a/src/update.cc +++ b/src/update.cc @@ -18,6 +18,8 @@ using namespace boost; extern ZYpp::Ptr God; +/** Use ui::Selectable::updateCandidateObj() */ +#define USE_THE_ONE 1 // ---------------------------------------------------------------------------- // @@ -719,7 +721,11 @@ void mark_updates(Zypper & zypper, const ResKindSet & kinds, bool skip_interacti { ui::Selectable::Ptr s = *solvit; #if USE_THE_ONE - PoolItem theone = s.theObj(); + PoolItem theone = s.updateCandidateObj(); + // if there's no update candidate, then there must be an installed object + // otherwise there would be no selectable of this name & kind + if (!theone) + theone = s.installedObj(); #else PoolItem theone = findTheBest(God->pool(), *s); #endif -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0