June 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10303 - /branches/SuSE-Linux-11_0-Branch/zypper/
by jkupec＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: jkupec Date: Mon Jun 2 15:51:16 2008 New Revision: 10303 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10303&view=rev Log: Blocked revisions 10284-10285,10287-10289 via svnmerge ........ r10284 | jreidinger | 2008-05-30 15:37:07 +0200 (Fri, 30 May 2008) | 1 line show help messages when show license in pager (bnc #394394) ........ r10285 | jreidinger | 2008-05-30 15:42:34 +0200 (Fri, 30 May 2008) | 1 line changes ........ r10287 | jkupec | 2008-05-30 18:17:42 +0200 (Fri, 30 May 2008) | 2 lines - some license display corrections ........ r10288 | jkupec | 2008-05-30 18:30:05 +0200 (Fri, 30 May 2008) | 2 lines - zypper up <foo> to defaults to -t package (bnc #385990) ........ r10289 | jkupec | 2008-05-30 18:55:10 +0200 (Fri, 30 May 2008) | 2 lines changes ........ Modified: branches/SuSE-Linux-11_0-Branch/zypper/ (props changed) -- 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] r10302 - /branches/SuSE-Linux-11_0-Branch/zypper/
by jkupec＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: jkupec Date: Mon Jun 2 15:42:31 2008 New Revision: 10302 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10302&view=rev Log: svnmerge.py init -r 1-10278 http://svn.opensuse.org/svn/zypp/trunk/zypper Modified: branches/SuSE-Linux-11_0-Branch/zypper/ (props changed) -- 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] r10301 - /branches/SuSE-Linux-11_0-Branch/zypper/
by jkupec＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: jkupec Date: Mon Jun 2 15:41:27 2008 New Revision: 10301 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10301&view=rev Log: - svnmerge uninit Modified: branches/SuSE-Linux-11_0-Branch/zypper/ (props changed) -- 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] r10300 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: schubi2 Date: Mon Jun 2 15:32:23 2008 New Revision: 10300 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10300&view=rev Log: r 10299 Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Jun 2 15:32:23 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Jun 2 15:31:36 CEST 2008 - schubi(a)suse.de + +- New option for ignoring Obsoletes. This is used for installing more than + one pacakges with the same name but different versions. + Often used by kernel. +- r 10299 + +------------------------------------------------------------------- Sun Jun 1 23:14:34 CEST 2008 - - ma(a)suse.de - Revert inappropriate Selectable cleanup. Fix Selectable -- 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] r10299 - in /trunk/libzypp/zypp: Resolver.cc Resolver.h solver/detail/Resolver.cc solver/detail/Resolver.h solver/detail/SATResolver.cc solver/detail/SATResolver.h
by schubi2＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: schubi2 Date: Mon Jun 2 15:31:09 2008 New Revision: 10299 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10299&view=rev Log: New option for ignoring Obsoletes. This is used for installing more than one pacakges with the same name but different versions. Often needed by kernels. Modified: trunk/libzypp/zypp/Resolver.cc trunk/libzypp/zypp/Resolver.h trunk/libzypp/zypp/solver/detail/Resolver.cc trunk/libzypp/zypp/solver/detail/Resolver.h trunk/libzypp/zypp/solver/detail/SATResolver.cc trunk/libzypp/zypp/solver/detail/SATResolver.h Modified: trunk/libzypp/zypp/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.cc?rev=102… ============================================================================== --- trunk/libzypp/zypp/Resolver.cc (original) +++ trunk/libzypp/zypp/Resolver.cc Mon Jun 2 15:31:09 2008 @@ -96,6 +96,25 @@ else return _pimpl->onlyRequires(); } + + void Resolver::addNoObsoletesCapability (const Capability & capability) + { _pimpl->addNoObsoletesCapability (capability); } + void Resolver::removeNoObsoletesCapability (const Capability & capability) + { _pimpl->removeNoObsoletesCapability (capability); } + CapabilitySet Resolver::noObsoletesCapability() + { _pimpl->noObsoletesCapability(); } + void Resolver::addNoObsoletesItem (const PoolItem & item) + { _pimpl->addNoObsoletesItem (item); } + void Resolver::removeNoObsoletesItem (const PoolItem & item) + { _pimpl->removeNoObsoletesItem (item); } + solver::detail::PoolItemSet Resolver::noObsoletesItem() + { _pimpl->noObsoletesItem(); } + void Resolver::addNoObsoletesName (const std::string & name) + { _pimpl->addNoObsoletesName (name); } + void Resolver::removeNoObsoletesName (const std::string & name) + { _pimpl->removeNoObsoletesName (name); } + solver::detail::ObsoleteStrings Resolver::noObsoletesString () + { _pimpl->noObsoletesString (); } void Resolver::addRequire (const Capability & capability) { _pimpl->addExtraRequire( capability ); } Modified: trunk/libzypp/zypp/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.h?rev=1029… ============================================================================== --- trunk/libzypp/zypp/Resolver.h (original) +++ trunk/libzypp/zypp/Resolver.h Mon Jun 2 15:31:09 2008 @@ -180,6 +180,25 @@ bool onlyRequires(); /** + * Ignore Obsoletes. This is used for installing more than + * one pacakges with the same name but different versions. + * Often needed by kernels. + **/ + /* via capability who provides it */ + void addNoObsoletesCapability (const Capability & capability); + void removeNoObsoletesCapability (const Capability & capability); + CapabilitySet noObsoletesCapability(); + /* via poolItem */ + void addNoObsoletesItem (const PoolItem & item); + void removeNoObsoletesItem (const PoolItem & item); + solver::detail::PoolItemSet noObsoletesItem(); + + // via package name + void addNoObsoletesName (const std::string & name); + void removeNoObsoletesName (const std::string & name); + solver::detail::ObsoleteStrings noObsoletesString (); + + /** * Adding additional requirement * */ Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Mon Jun 2 15:31:09 2008 @@ -138,7 +138,6 @@ _extra_conflicts.erase (capability); } - void Resolver::removeQueueItem (const SolverQueueItem_Ptr item) { bool found = false; @@ -241,6 +240,11 @@ // Regard dependencies of the item weak onl _addWeak.clear(); + // Ignore Obsoletes + _noObsoletesCapability.clear(); + _noObsoletesItem.clear(); + _noObsoletesString.clear(); + // Additional QueueItems which has to be regarded by the solver _removed_queue_items.clear(); _added_queue_items.clear(); @@ -307,7 +311,9 @@ Resolver::resolvePool() { solverInit(); - return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak); + return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak, + _noObsoletesCapability, _noObsoletesItem, _noObsoletesString + ); } bool @@ -347,7 +353,8 @@ _removed_queue_items.clear(); _added_queue_items.clear(); - return _satResolver->resolveQueue(queue, _addWeak); + return _satResolver->resolveQueue(queue, _addWeak, + _noObsoletesCapability, _noObsoletesItem, _noObsoletesString); } Modified: trunk/libzypp/zypp/solver/detail/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.h (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.h Mon Jun 2 15:31:09 2008 @@ -88,6 +88,8 @@ // // CLASS NAME : Resolver +typedef std::set<std::string> ObsoleteStrings; + class Resolver : public base::ReferenceCounted, private base::NonCopyable { private: @@ -127,6 +129,12 @@ // Additional information about the solverrun ItemCapKindMap _isInstalledBy; ItemCapKindMap _installs; + + + // Ignore Obsoletes + CapabilitySet _noObsoletesCapability; + PoolItemSet _noObsoletesItem; + ObsoleteStrings _noObsoletesString; // helpers bool doesObsoleteCapability (PoolItem candidate, const Capability & cap); @@ -156,6 +164,32 @@ ResPool pool (void) const; void setPool (const ResPool & pool) { _pool = pool; } + + // Ignore Obsoletes. This is used for installing more than + // one pacakges with the same name but different versions. + // Often needed by kernels. + + // via capability who provides it + void addNoObsoletesCapability (const Capability & capability) + { _noObsoletesCapability.insert (capability); } + void removeNoObsoletesCapability (const Capability & capability) + { _noObsoletesCapability.erase (capability); } + CapabilitySet noObsoletesCapability() { return _noObsoletesCapability;} + + // via poolItem + void addNoObsoletesItem (const PoolItem & item) + { _noObsoletesItem.insert (item); } + void removeNoObsoletesItem (const PoolItem & item) + { _noObsoletesItem.erase (item); } + PoolItemSet noObsoletesItem() { return _noObsoletesItem; } + + // via package name + void addNoObsoletesName (const std::string & name) + { _noObsoletesString.insert (name); } + void removeNoObsoletesName (const std::string & name) + { _noObsoletesString.erase (name); } + ObsoleteStrings noObsoletesString () { return _noObsoletesString; } + void addExtraRequire (const Capability & capability); void removeExtraRequire (const Capability & capability); void addExtraConflict (const Capability & capability); Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Mon Jun 2 15:31:09 2008 @@ -574,7 +574,10 @@ void -SATResolver::solverInit(const PoolItemList & weakItems) +SATResolver::solverInit(const PoolItemList & weakItems, + const CapabilitySet & noObsoletesCapability, + const PoolItemSet & noObsoletesItem, + const ObsoleteStrings & noObsoletesString) { SATCollectTransact info (*this); @@ -605,6 +608,30 @@ queue_push( &(_jobQueue), SOLVER_WEAKEN_SOLVABLE_DEPS ); queue_push( &(_jobQueue), id ); } + + for (CapabilitySet::const_iterator iter = noObsoletesCapability.begin(); iter != noObsoletesCapability.end(); iter++) { + queue_push( &(_jobQueue), SOLVER_NOOBSOLETES_SOLVABLE_PROVIDES ); + queue_push( &(_jobQueue), iter->id() ); + MIL << "Ignore Obsoletes of provided capability: " << *iter << endl; + } + + for (PoolItemSet::iterator it = noObsoletesItem.begin(); it != noObsoletesItem.end(); ++it) { + Id id = (*it)->satSolvable().id(); + if (id == ID_NULL) { + ERR << "Item " << *it << " not found" << endl; + } else { + MIL << "Ignore Obsoletes of item: " << *it << endl; + queue_push( &(_jobQueue), SOLVER_NOOBSOLETES_SOLVABLE ); + queue_push( &(_jobQueue), id ); + } + } + + for (ObsoleteStrings::iterator it = noObsoletesString.begin(); it != noObsoletesString.end(); ++it) { + MIL << "Ignore Obsoletes of name: " << *it << endl; + ::Id id = IdString(*it).id(); + queue_push( &(_jobQueue), SOLVER_NOOBSOLETES_SOLVABLE_NAME ); + queue_push( &(_jobQueue), id ); + } } void @@ -620,21 +647,28 @@ bool SATResolver::resolvePool(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps, - const PoolItemList & weakItems) + const PoolItemList & weakItems, + const CapabilitySet & noObsoletesCapability, + const PoolItemSet & noObsoletesItem, + const ObsoleteStrings & noObsoletesString) { MIL << "SATResolver::resolvePool()" << endl; // initialize - solverInit(weakItems); + solverInit(weakItems, + noObsoletesCapability, + noObsoletesItem, + noObsoletesString); for (PoolItemList::const_iterator iter = _items_to_install.begin(); iter != _items_to_install.end(); iter++) { Id id = (*iter)->satSolvable().id(); if (id == ID_NULL) { ERR << "Install: " << *iter << " not found" << endl; + } else { + MIL << "Install " << *iter << endl; + queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); + queue_push( &(_jobQueue), id ); } - MIL << "Install " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); - queue_push( &(_jobQueue), id ); } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { @@ -695,12 +729,18 @@ bool SATResolver::resolveQueue(const SolverQueueItemList &requestQueue, - const PoolItemList & weakItems) + const PoolItemList & weakItems, + const CapabilitySet & noObsoletesCapability, + const PoolItemSet & noObsoletesItem, + const ObsoleteStrings & noObsoletesString) { MIL << "SATResolver::resolvQueue()" << endl; // initialize - solverInit(weakItems); + solverInit(weakItems, + noObsoletesCapability, + noObsoletesItem, + noObsoletesString); // generate solver queue for (SolverQueueItemList::const_iterator iter = requestQueue.begin(); iter != requestQueue.end(); iter++) { @@ -712,10 +752,11 @@ Id id = (*iter)->satSolvable().id(); if (id == ID_NULL) { ERR << "Install: " << *iter << " not found" << endl; + } else { + MIL << "Install " << *iter << endl; + queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); + queue_push( &(_jobQueue), id ); } - MIL << "Install " << *iter << endl; - queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); - queue_push( &(_jobQueue), id ); } for (PoolItemList::const_iterator iter = _items_to_remove.begin(); iter != _items_to_remove.end(); iter++) { sat::detail::IdType ident( (*iter)->satSolvable().ident().id() ); @@ -766,7 +807,10 @@ MIL << "SATResolver::doUpdate()" << endl; // initialize - solverInit(PoolItemList()); + solverInit(PoolItemList(), + CapabilitySet(), + PoolItemSet(), + ObsoleteStrings()); _solv = solver_create( _SATPool, sat::Pool::instance().systemRepo().get() ); _solv->vendorCheckCb = &vendorCheck; Modified: trunk/libzypp/zypp/solver/detail/SATResolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.h (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.h Mon Jun 2 15:31:09 2008 @@ -92,7 +92,10 @@ void resetItemTransaction (PoolItem item); // Create a SAT solver and reset solver selection in the pool (Collecting - void solverInit(const PoolItemList & weakItems); + void solverInit(const PoolItemList & weakItems, + const CapabilitySet & noObsoletesCapability, + const PoolItemSet & noObsoletesItem, + const ObsoleteStrings & noObsoletesString); // common solver run with the _jobQueue; Save results back to pool bool solving(); // cleanup solver @@ -115,10 +118,18 @@ // solver run with pool selected items bool resolvePool(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps, - const PoolItemList & weakItems); + const PoolItemList & weakItems, + const CapabilitySet & noObsoletesCapability, + const PoolItemSet & noObsoletesItem, + const ObsoleteStrings & noObsoletesString + ); // solver run with the given request queue bool resolveQueue(const SolverQueueItemList &requestQueue, - const PoolItemList & weakItems); + const PoolItemList & weakItems, + const CapabilitySet & noObsoletesCapability, + const PoolItemSet & noObsoletesItem, + const ObsoleteStrings & noObsoletesString + ); // searching for new packages void doUpdate(); -- 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] r10298 - /trunk/zypper/src/zypper-main.cc
by jkupec＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: jkupec Date: Mon Jun 2 15:16:09 2008 New Revision: 10298 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10298&view=rev Log: - log zypper version _after_ logger is set up Modified: trunk/zypper/src/zypper-main.cc Modified: trunk/zypper/src/zypper-main.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-main.cc?rev=10… ============================================================================== --- trunk/zypper/src/zypper-main.cc (original) +++ trunk/zypper/src/zypper-main.cc Mon Jun 2 15:16:09 2008 @@ -53,7 +53,6 @@ int main(int argc, char **argv) { - MIL << "Hi, me zypper " VERSION " built " << __DATE__ << " " << __TIME__ << endl; struct Bye { ~Bye() { MIL << "Exiting main()" << endl; @@ -71,6 +70,8 @@ logfile = ZYPPER_LOG; zypp::base::LogControl::instance().logfile( logfile ); + MIL << "Hi, me zypper " VERSION " built " << __DATE__ << " " << __TIME__ << endl; + if (::signal(SIGINT, signal_handler) == SIG_ERR) cerr << "Failed to set SIGINT handler." << endl; if (::signal(SIGTERM, signal_handler) == SIG_ERR) -- 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] r10297 - in /branches/SuSE-Linux-11_0-Branch/libzypp: tests/zypp/CMakeLists.txt tests/zypp/StringUtils_test.cc zypp/base/String.h
by mlandres＠svn.opensuse.org 02 Jun '08

02 Jun '08

Author: mlandres Date: Mon Jun 2 14:22:11 2008 New Revision: 10297 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10297&view=rev Log: Add str::splitFields Added: branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/CMakeLists.txt branches/SuSE-Linux-11_0-Branch/libzypp/zypp/base/String.h Modified: branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/CMakeLists.txt (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/CMakeLists.txt Mon Jun 2 14:22:11 2008 @@ -28,6 +28,7 @@ RepoManager RepoStatus ResKind + StringUtils TranslatedText Url Vendor Added: branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc (added) +++ branches/SuSE-Linux-11_0-Branch/libzypp/tests/zypp/StringUtils_test.cc Mon Jun 2 14:22:11 2008 @@ -0,0 +1,35 @@ +// +// tests for String utilities zypp/base/String.h +// +#include <iostream> +#include "zypp/base/LogTools.h" +#include "zypp/base/String.h" + +#include <boost/test/auto_unit_test.hpp> + +using boost::unit_test::test_case; + +using namespace std; +using namespace zypp; + +#define DBG cout + +void chk_splitFields( const std::string & line, unsigned num ) +{ + std::vector<std::string> result; + DBG << ">>>" << line << "<<<" << endl; + BOOST_CHECK_EQUAL( str::splitFields( line, std::back_inserter(result) ), num ); + DBG << result << endl; + +} + +BOOST_AUTO_TEST_CASE(edition) +{ + chk_splitFields( "", 0 ); + chk_splitFields( ":", 2 ); + chk_splitFields( "a", 1 ); + chk_splitFields( "a:", 2 ); + chk_splitFields( ":a", 2 ); + chk_splitFields( ":a:", 3 ); + chk_splitFields( "a:a", 2 ); +} Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/base/String.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/base/String.h (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/base/String.h Mon Jun 2 14:22:11 2008 @@ -439,6 +439,57 @@ } return ret; } + + /** Split \a line_r into fields. + * Any single character in \a sepchars_r is treated as a + * field separator. The words are passed to OutputIterator + * \a result_r. + * \code + * "" -> words 0 + * ":" -> words 2 ||| + * "a" -> words 1 |a| + * ":a" -> words 2 ||a| + * "a:" -> words 2 |a|| + * ":a:" -> words 3 ||a|| + * + * \endcode + * + * \code + * std::vector<std::string> words; + * str::split( "some line", std::back_inserter(words) ) + * \endcode + * + */ + template<class _OutputIterator> + unsigned splitFields( const C_Str & line_r, + _OutputIterator result_r, + const C_Str & sepchars_r = ":" ) + { + const char * beg = line_r; + const char * cur = beg; + unsigned ret = 0; + for ( beg = cur; *beg; beg = cur, ++result_r ) + { + // skip non sepchars + while( *cur && !::strchr( sepchars_r, *cur ) ) + ++cur; + // build string + *result_r = std::string( beg, cur-beg ); + ++ret; + // skip sepchar + if ( *cur ) + { + ++cur; + if ( ! *cur ) // ending with sepchar + { + *result_r = std::string(); // add final empty field + ++ret; + break; + } + } + } + return ret; + } //@} /////////////////////////////////////////////////////////////////// -- 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] r10296 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes zypp/ui/SelectableImpl.cc
by mlandres＠svn.opensuse.org 01 Jun '08

01 Jun '08

Author: mlandres Date: Sun Jun 1 23:40:03 2008 New Revision: 10296 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10296&view=rev Log: - Revert inappropriate Selectable cleanup. Fix Selectable status computation. Unmaintained packages were wrongly reported as unsinstalled. (bnc #394630) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableImpl.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Sun Jun 1 23:40:03 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "25") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Sun Jun 1 23:40:03 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sun Jun 1 23:14:34 CEST 2008 - - ma(a)suse.de + +- Revert inappropriate Selectable cleanup. Fix Selectable + status computation. Unmaintained packages were wrongly + reported as unsinstalled. (bnc #394630) +- version 4.25.2 +- revision 10296 + +------------------------------------------------------------------- Wed May 28 18:54:27 CEST 2008 - ma(a)suse.de - Reenable diskusage calculation (bnc #395051) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableImpl.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableImpl.cc Sun Jun 1 23:40:03 2008 @@ -37,6 +37,8 @@ , cand( impl.candidateObj() ) {} + typedef Selectable::Impl::available_const_iterator available_const_iterator; + // // Queries // @@ -60,7 +62,7 @@ // void resetTransactingCandidates() const { - for ( Selectable::Impl::available_const_iterator it = _impl.availableBegin(); + for ( available_const_iterator it = _impl.availableBegin(); it != _impl.availableEnd(); ++it ) { (*it).status().setTransact( false, ResStatus::USER ); @@ -68,7 +70,7 @@ } void unlockCandidates() const { - for ( Selectable::Impl::available_const_iterator it = _impl.availableBegin(); + for ( available_const_iterator it = _impl.availableBegin(); it != _impl.availableEnd(); ++it ) { (*it).status().setTransact( false, ResStatus::USER ); @@ -77,7 +79,7 @@ } void lockCandidates() const { - for ( Selectable::Impl::available_const_iterator it = _impl.availableBegin(); + for ( available_const_iterator it = _impl.availableBegin(); it != _impl.availableEnd(); ++it ) { (*it).status().setTransact( false, ResStatus::USER ); @@ -90,7 +92,7 @@ if ( cand ) { if ( inst ) { - inst.status().resetTransact( ResStatus::USER ); + inst.status().setTransact( false, ResStatus::USER ); inst.status().setLock ( false, ResStatus::USER ); if ( ! cand->installOnly() ) { @@ -102,7 +104,7 @@ } } unlockCandidates(); - return cand.status().setToBeInstalled( ResStatus::USER ); + return cand.status().setTransact( true, ResStatus::USER ); } return false; } @@ -113,7 +115,7 @@ { resetTransactingCandidates(); inst.status().setLock( false, ResStatus::USER ); - return inst.status().setToBeUninstalled( ResStatus::USER ); + return inst.status().setTransact( true, ResStatus::USER ); } return false; } @@ -121,7 +123,7 @@ bool unset() const { if ( inst ) { - inst.status().resetTransact( ResStatus::USER ); + inst.status().setTransact( false, ResStatus::USER ); inst.status().setLock( false, ResStatus::USER ); } unlockCandidates(); @@ -132,7 +134,7 @@ { if ( inst ) { resetTransactingCandidates(); - inst.status().resetTransact( ResStatus::USER ); + inst.status().setTransact( false, ResStatus::USER ); return inst.status().setLock( true, ResStatus::USER ); } else return false; @@ -183,13 +185,15 @@ if ( !installedObj() && allCandidatesLocked() ) return S_Taboo; - // non packages are handled differently - if ( ! isKind<Package>(cand.resolvable()) ) - { - return( cand.status().isSatisfied() ? S_KeepInstalled : S_NoInst ); - } + // KEEP state: non packages count as installed if they are satisfied. + if ( installedObj() ) + return S_KeepInstalled; + + if ( kind() != ResKind::package + && cand.status().isSatisfied() ) // no installed, so we must have candidate + return S_KeepInstalled; - return( installedObj() ? S_KeepInstalled : S_NoInst ); + return S_NoInst; } bool Selectable::Impl::setStatus( const Status state_r ) -- 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] r10295 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/ui/SelectableImpl.cc
by mlandres＠svn.opensuse.org 01 Jun '08

01 Jun '08

Author: mlandres Date: Sun Jun 1 23:34:57 2008 New Revision: 10295 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10295&view=rev Log: - Revert inappropriate Selectable cleanup. Fix Selectable status computation. Unmaintained packages were wrongly reported as unsinstalled. (bnc #394630) Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ui/SelectableImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=10295&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Sun Jun 1 23:34:57 2008 @@ -44,7 +44,7 @@ # set COMPATMINOR to MINOR. (binary incompatible change) # -SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "25") -SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_MAJOR "5") +SET(LIBZYPP_MINOR "0") +SET(LIBZYPP_COMPATMINOR "0") +SET(LIBZYPP_PATCH "0") Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Sun Jun 1 23:34:57 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sun Jun 1 23:14:34 CEST 2008 - - ma(a)suse.de + +- Revert inappropriate Selectable cleanup. Fix Selectable + status computation. Unmaintained packages were wrongly + reported as unsinstalled. (bnc #394630) +- version 5.0.0 (4.x continued in SuSE-Linux-11_0-Branch) +- revision 10295 + +------------------------------------------------------------------- Fri May 30 12:14:47 CEST 2008 - tgoettlicher(a)suse.de - fixed typo Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.c… ============================================================================== --- trunk/libzypp/zypp/ui/SelectableImpl.cc (original) +++ trunk/libzypp/zypp/ui/SelectableImpl.cc Sun Jun 1 23:34:57 2008 @@ -37,6 +37,8 @@ , cand( impl.candidateObj() ) {} + typedef Selectable::Impl::available_const_iterator available_const_iterator; + // // Queries // @@ -60,7 +62,7 @@ // void resetTransactingCandidates() const { - for ( Selectable::Impl::available_const_iterator it = _impl.availableBegin(); + for ( available_const_iterator it = _impl.availableBegin(); it != _impl.availableEnd(); ++it ) { (*it).status().setTransact( false, ResStatus::USER ); @@ -68,7 +70,7 @@ } void unlockCandidates() const { - for ( Selectable::Impl::available_const_iterator it = _impl.availableBegin(); + for ( available_const_iterator it = _impl.availableBegin(); it != _impl.availableEnd(); ++it ) { (*it).status().setTransact( false, ResStatus::USER ); @@ -77,7 +79,7 @@ } void lockCandidates() const { - for ( Selectable::Impl::available_const_iterator it = _impl.availableBegin(); + for ( available_const_iterator it = _impl.availableBegin(); it != _impl.availableEnd(); ++it ) { (*it).status().setTransact( false, ResStatus::USER ); @@ -90,7 +92,7 @@ if ( cand ) { if ( inst ) { - inst.status().resetTransact( ResStatus::USER ); + inst.status().setTransact( false, ResStatus::USER ); inst.status().setLock ( false, ResStatus::USER ); if ( ! cand->installOnly() ) { @@ -102,7 +104,7 @@ } } unlockCandidates(); - return cand.status().setToBeInstalled( ResStatus::USER ); + return cand.status().setTransact( true, ResStatus::USER ); } return false; } @@ -113,7 +115,7 @@ { resetTransactingCandidates(); inst.status().setLock( false, ResStatus::USER ); - return inst.status().setToBeUninstalled( ResStatus::USER ); + return inst.status().setTransact( true, ResStatus::USER ); } return false; } @@ -121,7 +123,7 @@ bool unset() const { if ( inst ) { - inst.status().resetTransact( ResStatus::USER ); + inst.status().setTransact( false, ResStatus::USER ); inst.status().setLock( false, ResStatus::USER ); } unlockCandidates(); @@ -132,7 +134,7 @@ { if ( inst ) { resetTransactingCandidates(); - inst.status().resetTransact( ResStatus::USER ); + inst.status().setTransact( false, ResStatus::USER ); return inst.status().setLock( true, ResStatus::USER ); } else return false; @@ -183,13 +185,15 @@ if ( !installedObj() && allCandidatesLocked() ) return S_Taboo; - // non packages are handled differently - if ( ! isKind<Package>(cand.resolvable()) ) - { - return( cand.status().isSatisfied() ? S_KeepInstalled : S_NoInst ); - } + // KEEP state: non packages count as installed if they are satisfied. + if ( installedObj() ) + return S_KeepInstalled; + + if ( kind() != ResKind::package + && cand.status().isSatisfied() ) // no installed, so we must have candidate + return S_KeepInstalled; - return( installedObj() ? S_KeepInstalled : S_NoInst ); + return S_NoInst; } bool Selectable::Impl::setStatus( const Status state_r ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0