April 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r9898 - in /trunk/libzypp-testsuite/solver/data.deptestomatic: bugzilla-tests/ bugzilla/ patch-tests/ patch/ queue-tests/ queue/
by schubi2＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: schubi2 Date: Wed Apr 30 13:03:37 2008 New Revision: 9898 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9898&view=rev Log: renamed Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/ - copied from r9879, trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla/ trunk/libzypp-testsuite/solver/data.deptestomatic/patch-tests/ - copied from r9897, trunk/libzypp-testsuite/solver/data.deptestomatic/patch/ trunk/libzypp-testsuite/solver/data.deptestomatic/queue-tests/ - copied from r9897, trunk/libzypp-testsuite/solver/data.deptestomatic/queue/ Removed: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla/ trunk/libzypp-testsuite/solver/data.deptestomatic/patch/ trunk/libzypp-testsuite/solver/data.deptestomatic/queue/ -- 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] r9897 - in /trunk/libzypp/zypp/solver/detail: SATResolver.cc SATResolver.h
by schubi2＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: schubi2 Date: Wed Apr 30 12:10:03 2008 New Revision: 9897 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9897&view=rev Log: - remove _items_to_update - regarding user selected items in the resolve queue Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc trunk/libzypp/zypp/solver/detail/SATResolver.h 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 Wed Apr 30 12:10:03 2008 @@ -195,16 +195,6 @@ } } } - if (!found) { - for (PoolItemList::const_iterator iter = _items_to_update.begin(); - iter != _items_to_update.end(); iter++) { - if (*iter == item) { - _items_to_update.remove(*iter); - found = true; - break; - } - } - } } @@ -649,16 +639,6 @@ queue_push( &(_jobQueue), id ); } - for (PoolItemList::const_iterator iter = _items_to_update.begin(); iter != _items_to_update.end(); iter++) { - Id id = (*iter)->satSolvable().id(); - if (id == ID_NULL) { - ERR << "Update explicit: " << *iter << " not found" << endl; - } - MIL << "Update explicit " << *iter << " with the SAT-Pool ID: " << id << endl; - queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE_UPDATE ); - 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() ); MIL << "Delete " << *iter << " with the string ID: " << ident << endl; @@ -727,7 +707,49 @@ // generate solver queue for (SolverQueueItemList::const_iterator iter = requestQueue.begin(); iter != requestQueue.end(); iter++) { (*iter)->addRule(_jobQueue); + } + + // Add addition item status to the resolve-queue cause these can be set by problem resolutions + 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; + } + MIL << "Install " << *iter << " with the SAT-Pool ID: " << id << 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() ); + MIL << "Delete " << *iter << " with the string ID: " << ident << endl; + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE_NAME ); + queue_push( &(_jobQueue), ident); + } + for (PoolItemList::const_iterator iter = _items_to_lock.begin(); iter != _items_to_lock.end(); iter++) { + sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); + if (iter->status().isInstalled()) { + MIL << "Lock installed item " << *iter << " with the string ID: " << ident << endl; + queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE ); + queue_push( &(_jobQueue), ident ); + } else { + MIL << "Lock NOT installed item " << *iter << " with the string ID: " << ident << endl; + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE ); + queue_push( &(_jobQueue), ident ); + } + } + for (PoolItemList::const_iterator iter = _items_to_keep.begin(); iter != _items_to_keep.end(); iter++) { + sat::detail::SolvableIdType ident( (*iter)->satSolvable().id() ); + if (iter->status().isInstalled()) { + MIL << "Keep installed item " << *iter << " with the string ID: " << ident << endl; + queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE | SOLVER_WEAK); + queue_push( &(_jobQueue), ident ); + } else { + MIL << "Keep NOT installed item " << *iter << " with the string ID: " << ident << endl; + queue_push( &(_jobQueue), SOLVER_ERASE_SOLVABLE | SOLVER_WEAK); + queue_push( &(_jobQueue), ident ); + } } + // solving bool ret = solving(); 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 Wed Apr 30 12:10:03 2008 @@ -67,7 +67,6 @@ // list populated by calls to addPoolItemTo*() PoolItemList _items_to_install; - PoolItemList _items_to_update; PoolItemList _items_to_remove; PoolItemList _items_to_lock; PoolItemList _items_to_keep; -- 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] r9896 - /trunk/libzypp/zypp/PoolQueryResult.h
by mlandres＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: mlandres Date: Wed Apr 30 00:18:12 2008 New Revision: 9896 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9896&view=rev Log: docs Modified: trunk/libzypp/zypp/PoolQueryResult.h Modified: trunk/libzypp/zypp/PoolQueryResult.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.h?r… ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.h (original) +++ trunk/libzypp/zypp/PoolQueryResult.h Wed Apr 30 00:18:12 2008 @@ -45,6 +45,10 @@ * or \ref PoolItem or \ref PoolQuery or any type that fits * \c operator+=. * + * The class is a \ref sat::SolvIterMixin, so you can iterate the result + * not just as \ref sat::Solvable, but also as \ref PoolItem or + * \ref ui::Selectable. + * * \code * // Constructed from PoolItem iterator pair * PoolQueryResult result( pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ); -- 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] r9895 - in /trunk/libzypp: tests/zypp/PoolQuery_test.cc zypp/PoolQuery.cc zypp/PoolQuery.h
by jkupec＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: jkupec Date: Tue Apr 29 23:27:31 2008 New Revision: 9895 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9895&view=rev Log: - don't throw in begin() if the specified repo is not found in pool, return end() instead (bnc #384337) - catch exceptions within size() and empty(), act as if the result is empty in such case (bnc #384337) Modified: trunk/libzypp/tests/zypp/PoolQuery_test.cc trunk/libzypp/zypp/PoolQuery.cc trunk/libzypp/zypp/PoolQuery.h Modified: trunk/libzypp/tests/zypp/PoolQuery_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PoolQuery_tes… ============================================================================== --- trunk/libzypp/tests/zypp/PoolQuery_test.cc (original) +++ trunk/libzypp/tests/zypp/PoolQuery_test.cc Tue Apr 29 23:27:31 2008 @@ -222,7 +222,7 @@ PoolQuery q2; q2.addString("zypp\\"); q2.setMatchRegex(); - BOOST_CHECK_THROW(q2.size(), Exception); + BOOST_CHECK_THROW(q2.begin(), Exception); } Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=98… ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Tue Apr 29 23:27:31 2008 @@ -377,9 +377,8 @@ repo = pool.reposFind(theone); if (repo == Repository::noRepository) { - RepoInfo info; info.setAlias(theone); - ERR << "Repository not found in sat pool." << endl; - ZYPP_THROW(repo::RepoNotFoundException(info)); + DBG << "Repository '" << theone << "' not found in sat pool." << endl; + return end(); } } @@ -850,13 +849,22 @@ bool PoolQuery::empty() const - { return _pimpl->begin() == _pimpl->end(); } + { + try { return _pimpl->begin() == _pimpl->end(); } + catch (const Exception & ex) {} + return true; + } + - //! \todo collect the result, reuse if not dirty PoolQuery::size_type PoolQuery::size() const { size_type count = 0; - for(const_iterator it = _pimpl->begin(); it != _pimpl->end(); ++it, ++count); + try + { + for(const_iterator it = _pimpl->begin(); it != _pimpl->end(); ++it, ++count); + } + catch (const Exception & ex) {} + return count; } Modified: trunk/libzypp/zypp/PoolQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=989… ============================================================================== --- trunk/libzypp/zypp/PoolQuery.h (original) +++ trunk/libzypp/zypp/PoolQuery.h Tue Apr 29 23:27:31 2008 @@ -66,15 +66,28 @@ /** Query result accessers. */ //@{ - class PoolQueryIterator; - /** */ + /** + * Compile the query and return an iterator to the result. + * + * \return An iterator (\ref detail::PoolQueryIterator) returning + * sat::Solvable objects pointing at the beginning of the query result. + * \throws \ref Exception if the query was about to use a regex which + * failed to compile. + * + * \note Note that PoolQuery is derived from \ref sat::SolvIterMixin which + * makes PoolItem and Selectable iterators automatically available. + * \see sat::SolvIterMixin + */ const_iterator begin() const; - /** */ + + /** An iterator pointing to the end of the query result. */ const_iterator end() const; - /** */ + + /** Whether the result is empty. */ bool empty() const; - /** */ + + /** Number of solvables in the query result. */ size_type size() const; //@} -- 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] r9894 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: jkupec Date: Tue Apr 29 22:58:06 2008 New Revision: 9894 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9894&view=rev Log: changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Tue Apr 29 22:58:06 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 29 22:56:48 CEST 2008 - jkupec(a)suse.cz + +- basic cleanup upon SIGINT and SIGTERM (will remove + temporary repos) (bnc #340505) +- r9893 + +------------------------------------------------------------------- Tue Apr 29 13:41:25 CEST 2008 - jreidinger(a)suse.cz - show license in pager (bnc #260883) -- 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] r9893 - in /trunk/zypper: doc/zypper.8 src/zypper-main.cc src/zypper-main.h src/zypper-utils.cc src/zypper.cc src/zypper.h
by jkupec＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: jkupec Date: Tue Apr 29 22:55:22 2008 New Revision: 9893 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9893&view=rev Log: - basic cleanup upon SIGINT and SIGTERM (will remove temporary repos) (bnc #340505) Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper-main.cc trunk/zypper/src/zypper-main.h trunk/zypper/src/zypper-utils.cc trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=9893&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Tue Apr 29 22:55:22 2008 @@ -679,6 +679,9 @@ Returned by the \fBinstall\fR and the \fBremove\fR command in case any of the arguments does not match any of the available (or installed) resolvable names or other capabilities. +105 - ZYPPER_EXIT_ON_SIGNAL +Returned upon exiting after receiving a SIGINT or SIGTERM. + .SH "COMPATIBILITY WITH RUG" .LP Modified: trunk/zypper/src/zypper-main.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-main.cc?rev=98… ============================================================================== --- trunk/zypper/src/zypper-main.cc (original) +++ trunk/zypper/src/zypper-main.cc Tue Apr 29 22:55:22 2008 @@ -1,4 +1,6 @@ #include <iostream> +#include <signal.h> +//#include <readline/readline.h> #include "zypp/base/Logger.h" #include "zypp/base/LogControl.h" @@ -19,6 +21,34 @@ KeyRingCallbacks keyring_callbacks; DigestCallbacks digest_callbacks; + +void signal_handler(int sig) +{ + Zypper & zypper = *Zypper::instance(); + if (zypper.exitRequested()) + { + /* + if (zypper.runningShell()) + { + cout << endl << zypp::str::form( + _("Use '%s' or enter '%s' to quit the shell."), "Ctrl+D", "quit") << endl; + ::rl_reset_after_signal(); + exit(ZYPPER_EXIT_ON_SIGNAL); + //! \todo improve to drop to shell only + } + else*/ + { + // translators: this will show up if you press ctrl+c twice outside of zypper shell + cerr << _("OK OK! Exitting immediately...") << endl; + zypper.cleanup(); + exit(ZYPPER_EXIT_ON_SIGNAL); + } + } + else + zypper.requestExit(); +} + + int main(int argc, char **argv) { struct Bye { @@ -38,5 +68,10 @@ logfile = ZYPPER_LOG; zypp::base::LogControl::instance().logfile( logfile ); + if (::signal(SIGINT, signal_handler) == SIG_ERR) + cerr << "Failed to set SIGINT handler." << endl; + if (::signal(SIGTERM, signal_handler) == SIG_ERR) + cerr << "Failed to set SIGTERM handler." << endl; + return Zypper::instance()->main(argc, argv); } Modified: trunk/zypper/src/zypper-main.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-main.h?rev=989… ============================================================================== --- trunk/zypper/src/zypper-main.h (original) +++ trunk/zypper/src/zypper-main.h Tue Apr 29 22:55:22 2008 @@ -21,6 +21,7 @@ #define ZYPPER_EXIT_INF_REBOOT_NEEDED 102 // reboot needed after install/upgrade #define ZYPPER_EXIT_INF_RESTART_NEEDED 103 // restart of package manager itself needed #define ZYPPER_EXIT_INF_CAP_NOT_FOUND 104 // given capability not found (for install/remove) +#define ZYPPER_EXIT_ON_SIGNAL 105 // SIGINT or SIGTERM received // undefine _ and _PL macros from libzypp #ifdef _ Modified: trunk/zypper/src/zypper-utils.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-utils.cc?rev=9… ============================================================================== --- trunk/zypper/src/zypper-utils.cc (original) +++ trunk/zypper/src/zypper-utils.cc Tue Apr 29 22:55:22 2008 @@ -32,8 +32,9 @@ line_read = NULL; } - /* Get a line from the user. */ - line_read = readline ("zypper> "); + //::rl_catch_signals = 0; + /* Get a line from the user. */ + line_read = ::readline ("zypper> "); /* If the line has any text in it, save it on the history. */ Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=9893&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Apr 29 22:55:22 2008 @@ -62,7 +62,7 @@ : _argc(0), _argv(NULL), _out_ptr(NULL), _command(ZypperCommand::NONE), _exit_code(ZYPPER_EXIT_OK), - _running_shell(false), _running_help(false), + _running_shell(false), _running_help(false), _exit_requested(false), _sh_argc(0), _sh_argv(NULL) { MIL << "Hi, me zypper " VERSION " built " << __DATE__ << " " << __TIME__ << endl; @@ -642,7 +642,7 @@ else safeDoCommand(); } - catch (Exception & e) + catch (const Exception & e) { out().error(e.msg()); print_unknown_command_hint(*this); Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=9893&r1=… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Tue Apr 29 22:55:22 2008 @@ -142,10 +142,14 @@ void setExitCode(int exit) { _exit_code = exit; } bool runningShell() const { return _running_shell; } bool runningHelp() const { return _running_help; } - + bool exitRequested() const { return _exit_requested; } + void requestExit() { _exit_requested = true; } + int argc() { return _running_shell ? _sh_argc : _argc; } char ** argv() { return _running_shell ? _sh_argv : _argv; } + void cleanup(); + public: ~Zypper(); private: @@ -157,7 +161,6 @@ void shellCleanup(); void safeDoCommand(); void doCommand(); - void cleanup(); void setCommand(const ZypperCommand & command) { _command = command; } void setRunningShell(bool value = true) { _running_shell = value; } @@ -179,6 +182,7 @@ int _exit_code; bool _running_shell; bool _running_help; + bool _exit_requested; RuntimeData _rdata; @@ -196,11 +200,6 @@ { public: ExitRequestException(const std::string & msg = "") : zypp::Exception(msg) {} -// ExitRequestException(const std::string & msg = "") : _msg(msg) {} - -// const std::string & msg() const { return _msg; } -private: -// std::string _msg; }; #endif /*ZYPPER_H*/ -- 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] r9892 - /trunk/libzypp/zypp/PoolQueryResult.h
by mlandres＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: mlandres Date: Tue Apr 29 22:43:46 2008 New Revision: 9892 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9892&view=rev Log: typo Modified: trunk/libzypp/zypp/PoolQueryResult.h Modified: trunk/libzypp/zypp/PoolQueryResult.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.h?r… ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.h (original) +++ trunk/libzypp/zypp/PoolQueryResult.h Tue Apr 29 22:43:46 2008 @@ -156,7 +156,7 @@ /** Remove Items from the result. */ PoolQueryResult & operator-=( const PoolQueryResult & query_r ) { - if ( &query_r == this ) // catch self intersection! + if ( &query_r == this ) // catch self removal! clear(); else for_( it, query_r.begin(), query_r.end() ) -- 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] r9891 - in /trunk/libzypp: devel/devel.ma/NewPool.cc zypp/CMakeLists.txt zypp/PoolQueryResult.cc zypp/PoolQueryResult.h
by mlandres＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: mlandres Date: Tue Apr 29 22:28:57 2008 New Revision: 9891 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9891&view=rev Log: Add class PoolQueryResult: Helper class to collect (not only) PoolQuery results. Added: trunk/libzypp/zypp/PoolQueryResult.cc trunk/libzypp/zypp/PoolQueryResult.h Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/zypp/CMakeLists.txt Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Tue Apr 29 22:28:57 2008 @@ -1,5 +1,7 @@ #include "Tools.h" +#include "zypp/PoolQueryResult.h" + #include <zypp/base/PtrTypes.h> #include <zypp/base/Exception.h> #include <zypp/base/Gettext.h> @@ -454,112 +456,6 @@ namespace zypp { - /** Helper class to collect (not only) \ref PoolQuery results. - * - * \note Unfortunately \ref PoolQuery::begin might throw. Exceptions - * are caught and the query is treated as empty. - * - * \ref PoolQueryResult maintains a set of \ref sat::Solvable. You can - * add/remove solvables to/from the set defined by: - * - * \li a single \ref sat::Solvable - * \li a \ref PoolQuery - * \li an other \ref PoolQueryResult - * \li any iterator pair with \c value_type \ref sat::Solvable or \ref PoolQuery - * or \ref PoolQueryResult (any type that fits \c operator+=) - */ - class PoolQueryResult : public sat::SolvIterMixin<PoolQueryResult,std::tr1::unordered_set<sat::Solvable>::const_iterator> - { - public: - typedef std::tr1::unordered_set<sat::Solvable> ResultSet; - typedef ResultSet::size_type size_type; - typedef ResultSet::const_iterator const_iterator; - - public: - PoolQueryResult() - {} - - explicit PoolQueryResult( sat::Solvable result_r ) - { _result.insert( result_r ); } - - explicit PoolQueryResult( const PoolQuery & query_r ) - { operator+=( query_r ); } - - template<class _QueryResultIter> - PoolQueryResult( _QueryResultIter begin_r, _QueryResultIter end_r ) - { - for_( it, begin_r, end_r ) - { - operator+=( *it ); - } - } - - public: - /***/ - bool empty() const - { return _result.empty(); } - /***/ - size_type size() const - { return _result.size(); } - /***/ - const_iterator begin() const - { return _result.begin(); } - /***/ - const_iterator end() const - { return _result.end(); } - - public: - /** - */ - PoolQueryResult & operator+=( const PoolQueryResult & query_r ) - { - if ( ! query_r.empty() ) - _result.insert( query_r.begin(), query_r.end() ); - return *this; - } - /** \overload */ - PoolQueryResult & operator+=( const PoolQuery & query_r ) - { return operator+=( PoolQueryResult( query_r ) ); } - /** \overload */ - PoolQueryResult & operator+=( sat::Solvable result_r ) - { _result.insert( result_r ); return *this; } - - /** - */ - PoolQueryResult & operator-=( const PoolQueryResult & query_r ); - /** \overload */ - PoolQueryResult & operator-=( const PoolQuery & query_r ) - { return operator-=( PoolQueryResult( query_r ) ); } - /** \overload */ - PoolQueryResult & operator-=( sat::Solvable result_r ) - { return operator+=( PoolQueryResult( result_r ) ); } - - public: - /** - */ - PoolQueryResult operator+( const PoolQueryResult & query_r ) const - { return PoolQueryResult(*this) += query_r; } - /** \overload */ - PoolQueryResult operator+( const PoolQuery & query_r ) const - { return PoolQueryResult(*this) += query_r; } - /** \overload */ - PoolQueryResult operator+( sat::Solvable result_r ) const - { return PoolQueryResult(*this) += result_r; } - - /** - */ - PoolQueryResult operator-( const PoolQueryResult & query_r ) const - { return PoolQueryResult(*this) -= query_r; } - /** \overload */ - PoolQueryResult operator-( const PoolQuery & query_r ) const - { return PoolQueryResult(*this) -= query_r; } - /** \overload */ - PoolQueryResult operator-( sat::Solvable result_r ) const - { return PoolQueryResult(*this) -= result_r; } - - private: - ResultSet _result; - }; } void tt( const std::string & name_r, ResKind kind_r = ResKind::package ) @@ -719,7 +615,28 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// + //ResPool pool( ResPool::instance() ); + + // + PoolQueryResult result( pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ); + MIL << result.size() << endl; + + { + PoolQuery q; + q.addAttribute( sat::SolvAttr::name, "[a-zA-Z]*" ); + q.setMatchGlob(); + result -= q; + MIL << result.size() << endl; + } + MIL << result << endl; + + sat::WhatProvides poviders( Capability("3ddiag") ); + result -= PoolQueryResult( poviders.begin(), poviders.end() ); + MIL << result << endl; + + result -= result; + MIL << result << endl; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=… ============================================================================== --- trunk/libzypp/zypp/CMakeLists.txt (original) +++ trunk/libzypp/zypp/CMakeLists.txt Tue Apr 29 22:28:57 2008 @@ -44,6 +44,7 @@ Pattern.cc PoolItem.cc PoolQuery.cc + PoolQueryResult.cc ProblemSolution.cc Product.cc ProgressData.cc @@ -135,6 +136,7 @@ PoolItem.h PoolQuery.h PoolQueryUtil.tcc + PoolQueryResult.h ProblemSolution.h ProblemTypes.h Product.h Added: trunk/libzypp/zypp/PoolQueryResult.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.cc?… ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.cc (added) +++ trunk/libzypp/zypp/PoolQueryResult.cc Tue Apr 29 22:28:57 2008 @@ -0,0 +1,35 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/PoolQueryResult.cc + * +*/ +#include <iostream> +#include "zypp/base/LogTools.h" + +#include "zypp/PoolQueryResult.h" + +using std::endl; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const PoolQueryResult & obj ) + { + return dumpRange( str, obj.begin(), obj.end() ); + } + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/PoolQueryResult.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryResult.h?r… ============================================================================== --- trunk/libzypp/zypp/PoolQueryResult.h (added) +++ trunk/libzypp/zypp/PoolQueryResult.h Tue Apr 29 22:28:57 2008 @@ -0,0 +1,223 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/PoolQueryResult.h + * +*/ +#ifndef ZYPP_POOLQUERYRESULT_H +#define ZYPP_POOLQUERYRESULT_H + +#include <iosfwd> + +#include "zypp/base/Tr1hash.h" +#include "zypp/base/Exception.h" +#include "zypp/sat/SolvIterMixin.h" + +#include "zypp/PoolItem.h" +#include "zypp/PoolQuery.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : PoolQueryResult + // + /** Helper class to collect (not only) \ref PoolQuery results. + * + * \note Unfortunately \ref PoolQuery::begin might throw. Exceptions + * are caught and the query is treated as empty. + * + * \ref PoolQueryResult maintains a set of \ref sat::Solvable. You can + * add/remove solvables to/from the set defined by: + * + * \li a single \ref sat::Solvable + * \li a single \ref PoolItem + * \li a \ref PoolQuery + * \li an other \ref PoolQueryResult + * \li any iterator pair with \c value_type \ref sat::Solvable + * or \ref PoolItem or \ref PoolQuery or any type that fits + * \c operator+=. + * + * \code + * // Constructed from PoolItem iterator pair + * PoolQueryResult result( pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ); + * MIL << result.size() << endl; + * + * { + * // Removing a PoolQuery result + * PoolQuery q; + * q.addAttribute( sat::SolvAttr::name, "[a-zA-Z]*" ); + * q.setMatchGlob(); + * result -= q; + * MIL << result.size() << endl; + * } + * MIL << result << endl; + * + * // Removing a range of sat::Solvables + * sat::WhatProvides poviders( Capability("3ddiag") ); + * result -= PoolQueryResult( poviders.begin(), poviders.end() ); + * + * // packages not starting with a letter, except 3ddiag + * MIL << result << endl; + * \endcode + */ + class PoolQueryResult : public sat::SolvIterMixin<PoolQueryResult,std::tr1::unordered_set<sat::Solvable>::const_iterator> + { + public: + typedef std::tr1::unordered_set<sat::Solvable> ResultSet; + typedef ResultSet::size_type size_type; + typedef ResultSet::const_iterator const_iterator; + + public: + /** Default ctor (empty result) */ + PoolQueryResult() + {} + + /** Ctor adding one \ref sat::Solvable. */ + explicit PoolQueryResult( sat::Solvable result_r ) + { operator+=( result_r ); } + + /** Ctor adding one \ref PoolItem. */ + explicit PoolQueryResult( const PoolItem & result_r ) + { operator+=( result_r ); } + + /** Ctor adding one \ref PoolQuery result. */ + explicit PoolQueryResult( const PoolQuery & query_r ) + { operator+=( query_r ); } + + /** Ctor adding a range of items for which \ref operator+= is defined. */ + template<class _QueryResultIter> + PoolQueryResult( _QueryResultIter begin_r, _QueryResultIter end_r ) + { + for_( it, begin_r, end_r ) + { + operator+=( *it ); + } + } + + public: + /** Whether the result is empty. */ + bool empty() const + { return _result.empty(); } + /** The number of \ref sat::Solvables. */ + size_type size() const + { return _result.size(); } + /** */ + const_iterator begin() const + { return _result.begin(); } + /** */ + const_iterator end() const + { return _result.end(); } + + public: + /** Clear the result. */ + void clear() + { _result.clear(); } + + /** Add items to the result. */ + PoolQueryResult & operator+=( const PoolQueryResult & query_r ) + { + if ( ! query_r.empty() ) + _result.insert( query_r.begin(), query_r.end() ); + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( const PoolQuery & query_r ) + { + try + { + for_( it, query_r.begin(), query_r.end() ) + _result.insert( *it ); + } + catch ( const Exception & ) + {} + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( sat::Solvable result_r ) + { + _result.insert( result_r ); + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( const PoolItem & result_r ) + { + _result.insert( result_r.satSolvable() ); + return *this; + } + + /** Remove Items from the result. */ + PoolQueryResult & operator-=( const PoolQueryResult & query_r ) + { + if ( &query_r == this ) // catch self intersection! + clear(); + else + for_( it, query_r.begin(), query_r.end() ) + _result.erase( *it ); + return *this; + } + /** \overload */ + PoolQueryResult & operator-=( const PoolQuery & query_r ) + { + try + { + for_( it, query_r.begin(), query_r.end() ) + _result.erase( *it ); + } + catch ( const Exception & ) + {} + return *this; + } + /** \overload */ + PoolQueryResult & operator-=( sat::Solvable result_r ) + { + _result.erase( result_r ); + return *this; + } + /** \overload */ + PoolQueryResult & operator-=( const PoolItem & result_r ) + { + _result.erase( result_r.satSolvable() ); + return *this; + } + + public: + /** Combine results. */ + PoolQueryResult operator+( const PoolQueryResult & query_r ) const + { return PoolQueryResult(*this) += query_r; } + /** \overload */ + PoolQueryResult operator+( const PoolQuery & query_r ) const + { return PoolQueryResult(*this) += query_r; } + /** \overload */ + PoolQueryResult operator+( sat::Solvable result_r ) const + { return PoolQueryResult(*this) += result_r; } + + /** Intersect results. */ + PoolQueryResult operator-( const PoolQueryResult & query_r ) const + { return PoolQueryResult(*this) -= query_r; } + /** \overload */ + PoolQueryResult operator-( const PoolQuery & query_r ) const + { return PoolQueryResult(*this) -= query_r; } + /** \overload */ + PoolQueryResult operator-( sat::Solvable result_r ) const + { return PoolQueryResult(*this) -= result_r; } + + private: + ResultSet _result; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates PoolQueryResult Stream output */ + std::ostream & operator<<( std::ostream & str, const PoolQueryResult & obj ); + + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_POOLQUERYRESULT_H -- 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] r9890 - in /trunk/libzypp: devel/devel.ma/NewPool.cc zypp/ResPool.cc zypp/ResPool.h zypp/ResStatus.cc zypp/ResStatus.h zypp/pool/PoolImpl.h zypp/pool/PoolTraits.h zypp/target/TargetImpl.cc
by mlandres＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: mlandres Date: Tue Apr 29 18:19:41 2008 New Revision: 9890 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9890&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/zypp/ResPool.cc trunk/libzypp/zypp/ResPool.h trunk/libzypp/zypp/ResStatus.cc trunk/libzypp/zypp/ResStatus.h trunk/libzypp/zypp/pool/PoolImpl.h trunk/libzypp/zypp/pool/PoolTraits.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.c… ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Tue Apr 29 18:19:41 2008 @@ -454,33 +454,112 @@ namespace zypp { -// poolItemIterator - template <class _Filter> - class PoolFilter + /** Helper class to collect (not only) \ref PoolQuery results. + * + * \note Unfortunately \ref PoolQuery::begin might throw. Exceptions + * are caught and the query is treated as empty. + * + * \ref PoolQueryResult maintains a set of \ref sat::Solvable. You can + * add/remove solvables to/from the set defined by: + * + * \li a single \ref sat::Solvable + * \li a \ref PoolQuery + * \li an other \ref PoolQueryResult + * \li any iterator pair with \c value_type \ref sat::Solvable or \ref PoolQuery + * or \ref PoolQueryResult (any type that fits \c operator+=) + */ + class PoolQueryResult : public sat::SolvIterMixin<PoolQueryResult,std::tr1::unordered_set<sat::Solvable>::const_iterator> { - typedef filter_iterator<_Filter,ResPool::const_iterator> iterator; + public: + typedef std::tr1::unordered_set<sat::Solvable> ResultSet; + typedef ResultSet::size_type size_type; + typedef ResultSet::const_iterator const_iterator; public: - PoolFilter() + PoolQueryResult() {} - PoolFilter( const _Filter & filter_r ) - : _filter( filter_r ) - {} + explicit PoolQueryResult( sat::Solvable result_r ) + { _result.insert( result_r ); } + + explicit PoolQueryResult( const PoolQuery & query_r ) + { operator+=( query_r ); } + + template<class _QueryResultIter> + PoolQueryResult( _QueryResultIter begin_r, _QueryResultIter end_r ) + { + for_( it, begin_r, end_r ) + { + operator+=( *it ); + } + } + + public: + /***/ + bool empty() const + { return _result.empty(); } + /***/ + size_type size() const + { return _result.size(); } + /***/ + const_iterator begin() const + { return _result.begin(); } + /***/ + const_iterator end() const + { return _result.end(); } - iterator begin() const - { return ResPool::instance().filterBegin(_filter); } + public: + /** + */ + PoolQueryResult & operator+=( const PoolQueryResult & query_r ) + { + if ( ! query_r.empty() ) + _result.insert( query_r.begin(), query_r.end() ); + return *this; + } + /** \overload */ + PoolQueryResult & operator+=( const PoolQuery & query_r ) + { return operator+=( PoolQueryResult( query_r ) ); } + /** \overload */ + PoolQueryResult & operator+=( sat::Solvable result_r ) + { _result.insert( result_r ); return *this; } + + /** + */ + PoolQueryResult & operator-=( const PoolQueryResult & query_r ); + /** \overload */ + PoolQueryResult & operator-=( const PoolQuery & query_r ) + { return operator-=( PoolQueryResult( query_r ) ); } + /** \overload */ + PoolQueryResult & operator-=( sat::Solvable result_r ) + { return operator+=( PoolQueryResult( result_r ) ); } - iterator end() const - { return ResPool::instance().filterEnd(_filter); } + public: + /** + */ + PoolQueryResult operator+( const PoolQueryResult & query_r ) const + { return PoolQueryResult(*this) += query_r; } + /** \overload */ + PoolQueryResult operator+( const PoolQuery & query_r ) const + { return PoolQueryResult(*this) += query_r; } + /** \overload */ + PoolQueryResult operator+( sat::Solvable result_r ) const + { return PoolQueryResult(*this) += result_r; } + + /** + */ + PoolQueryResult operator-( const PoolQueryResult & query_r ) const + { return PoolQueryResult(*this) -= query_r; } + /** \overload */ + PoolQueryResult operator-( const PoolQuery & query_r ) const + { return PoolQueryResult(*this) -= query_r; } + /** \overload */ + PoolQueryResult operator-( sat::Solvable result_r ) const + { return PoolQueryResult(*this) -= result_r; } private: - _Filter _filter; + ResultSet _result; }; - - template <class _Filter> - PoolFilter<_Filter> makePoolFilter( const _Filter & filter_r ) - { return PoolFilter<_Filter>( filter_r ); } } void tt( const std::string & name_r, ResKind kind_r = ResKind::package ) @@ -502,12 +581,36 @@ outs << t << ": {" << endl; for_( it, pool.begin(), pool.end() ) { - if ( it->status().isSoftLocked() ) + if ( it->status().isLocked() ) outs << " " << *it << endl; } outs << '}' << endl; } +void ssup() +{ + ResPool pool( ResPool::instance() ); + + ResPool::HardLockQueries newLocks; + + { + PoolQuery q; + q.addAttribute( sat::SolvAttr::name, "kde3*" ); + q.setMatchGlob(); + dumpRange( DBG, q.begin(), q.end() ) << endl; + newLocks.push_back( q ); + } + { + PoolQuery q; + q.addAttribute( sat::SolvAttr::name, "kde4*" ); + q.setMatchGlob(); + dumpRange( DBG, q.begin(), q.end() ) << endl; + newLocks.push_back( q ); + } + + pool.setHardLockQueries( newLocks ); + +} /****************************************************************** @@ -521,10 +624,14 @@ ++argv; zypp::base::LogControl::instance().logToStdErr(); INT << "===[START]==========================================" << endl; + ZConfig::instance(); ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); + ssup(); + //sslk( "START" ); + if ( 1 ) { RepoManager repoManager( makeRepoManager( sysRoot ) ); @@ -579,6 +686,8 @@ } USR << "pool: " << pool << endl; + + sslk( nrepo.alias() ); } } } @@ -592,6 +701,7 @@ getZYpp()->initializeTarget( sysRoot ); } getZYpp()->target()->load(); + sslk( "TARGET" ); } } @@ -609,6 +719,13 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////// + INT << "===[END]============================================" << endl << endl; + zypp::base::LogControl::instance().logNothing(); + return 0; + SEC << zypp::getZYpp()->diskUsage() << endl; if ( 0 ) Modified: trunk/libzypp/zypp/ResPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResPool.cc?rev=9890… ============================================================================== --- trunk/libzypp/zypp/ResPool.cc (original) +++ trunk/libzypp/zypp/ResPool.cc Tue Apr 29 18:19:41 2008 @@ -95,6 +95,26 @@ void ResPool::getActiveSoftLocks( AutoSoftLocks & activeLocks_r ) { _pimpl->getActiveSoftLocks( activeLocks_r ); } + + bool ResPool::hardLockQueriesEmpty() const + { return _pimpl->hardLockQueries().empty(); } + + ResPool::size_type ResPool::hardLockQueriesSize() const + { return _pimpl->hardLockQueries().size(); } + + ResPool::hardLockQueries_iterator ResPool::hardLockQueriesBegin() const + { return _pimpl->hardLockQueries().begin(); } + + ResPool::hardLockQueries_iterator ResPool::hardLockQueriesEnd() const + { return _pimpl->hardLockQueries().end(); } + + void ResPool::setHardLockQueries( const HardLockQueries & newLocks_r ) + { _pimpl->setHardLockQueries( newLocks_r ); } + + void ResPool::getHardLockQueries( HardLockQueries & activeLocks_r ) + { _pimpl->getHardLockQueries( activeLocks_r ); } + + const pool::PoolTraits::ItemContainerT & ResPool::store() const { return _pimpl->store(); } Modified: trunk/libzypp/zypp/ResPool.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResPool.h?rev=9890&… ============================================================================== --- trunk/libzypp/zypp/ResPool.h (original) +++ trunk/libzypp/zypp/ResPool.h Tue Apr 29 18:19:41 2008 @@ -333,6 +333,35 @@ */ void getActiveSoftLocks( AutoSoftLocks & activeLocks_r ); //@} + + public: + /** \name Handle hard locks (e.g set from /etc/zypp/locks). + * + * As this kind of lock is query based, it's quite expensive. + * + * These queries are re-evaluated when adding new repos to the pool. + */ + //@{ + typedef pool::PoolTraits::HardLockQueries HardLockQueries; + typedef pool::PoolTraits::hardLockQueries_iterator hardLockQueries_iterator; + + bool hardLockQueriesEmpty() const; + size_type hardLockQueriesSize() const; + hardLockQueries_iterator hardLockQueriesBegin() const; + hardLockQueries_iterator hardLockQueriesEnd() const; + + /** Set a new set of queries. + * The hard-locks of existing PoolItems are adjusted according + * to the queries. (usually called on target load) + */ + void setHardLockQueries( const HardLockQueries & newLocks_r ); + + /** Suggest a new set of queries based on the current selection. + * (usually remembered on commit). + */ + void getHardLockQueries( HardLockQueries & activeLocks_r ); + //@} + private: const pool::PoolTraits::ItemContainerT & store() const; const pool::PoolTraits::Id2ItemT & id2item() const; Modified: trunk/libzypp/zypp/ResStatus.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.cc?rev=98… ============================================================================== --- trunk/libzypp/zypp/ResStatus.cc (original) +++ trunk/libzypp/zypp/ResStatus.cc Tue Apr 29 18:19:41 2008 @@ -58,7 +58,7 @@ ResStatus::ResStatus (enum StateValue s, enum ValidateValue v, enum TransactValue t, enum InstallDetailValue i, enum RemoveDetailValue r, enum SolverStateValue ssv) : _bitfield (s) { - fieldValueAssign<ValidateField>(v); + fieldValueAssign<ValidateField>(v); fieldValueAssign<TransactField>(t); if (t == TRANSACT) { if (s == INSTALLED) fieldValueAssign<TransactDetailField>(r); @@ -99,8 +99,10 @@ str << (obj.isRecommended() ? "r" : "" ); - str << (obj.isSuggested() ? "s" : "" ); - + str << (obj.isSuggested() ? "s" : "" ); +#ifdef HARDLOCKTEST + str << (obj.isUserLockQueryMatch() ? "L" : "_" ); +#endif return str; } Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=989… ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Tue Apr 29 18:19:41 2008 @@ -20,6 +20,11 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + namespace resstatus + { + class UserLockQueryManip; + } + /////////////////////////////////////////////////////////////////// // // CLASS NAME : ResStatus @@ -67,6 +72,7 @@ typedef bit::Range<FieldType,TransactDetailField::end, 1> SolverStateField; typedef bit::Range<FieldType,SolverStateField::end, 1> LicenceConfirmedField; typedef bit::Range<FieldType,LicenceConfirmedField::end, 2> WeakField; + typedef bit::Range<FieldType,WeakField::end, 1> UserLockQueryField; // internal // enlarge FieldType if more bit's needed. It's not yet // checked by the compiler. //@} @@ -142,6 +148,12 @@ RECOMMENDED = bit::RangeValue<WeakField,2>::value, SUGGESTED_AND_RECOMMENDED = bit::RangeValue<WeakField,3>::value }; + + enum UserLockQuery // internal + { + USERLOCK_NOMATCH = bit::RangeValue<UserLockQueryField,0>::value, + USERLOCK_MATCH = bit::RangeValue<UserLockQueryField,1>::value + }; //@} public: @@ -284,6 +296,19 @@ bool isToBeUninstalledSoft () const { return isToBeUninstalled() && fieldValueIs<TransactDetailField>( SOFT_REMOVE ); } + private: + + /** \name Internal hard lock maintainance */ + //@{ + friend class resstatus::UserLockQueryManip; + + bool isUserLockQueryMatch() const + { return fieldValueIs<UserLockQueryField>( USERLOCK_MATCH ); } + + void setUserLockQueryMatch( bool match_r ) + { fieldValueAssign<UserLockQueryField>( match_r ? USERLOCK_MATCH : USERLOCK_NOMATCH ); } + //@} + public: //------------------------------------------------------------------------ Modified: trunk/libzypp/zypp/pool/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/pool/PoolImpl.h?rev… ============================================================================== --- trunk/libzypp/zypp/pool/PoolImpl.h (original) +++ trunk/libzypp/zypp/pool/PoolImpl.h Tue Apr 29 18:19:41 2008 @@ -21,6 +21,7 @@ #include "zypp/pool/PoolTraits.h" #include "zypp/ResPoolProxy.h" +#include "zypp/PoolQuery.h" #include "zypp/sat/Pool.h" @@ -138,9 +139,31 @@ // /////////////////////////////////////////////////////////////////// public: - bool hardLockAppliesTo( sat::Solvable solv_r ) const + typedef PoolTraits::HardLockQueries HardLockQueries; + typedef PoolTraits::hardLockQueries_iterator hardLockQueries_iterator; + + const HardLockQueries & hardLockQueries() const + { return _hardLockQueries; } + + void reapplyHardLocks() const + { +#ifdef HARDLOCKTEST + SEC << "reapplyHardLocks " << endl; +#endif + } + + void setHardLockQueries( const HardLockQueries & newLocks_r ) { - return false; + MIL << "Apply " << newLocks_r.size() << " HardLockQueries" << endl; + _hardLockQueries = newLocks_r; + // now adjust the pool status + // TBD + } + + void getHardLockQueries( HardLockQueries & activeLocks_r ) + { + activeLocks_r = _hardLockQueries; // current queries + // TBD } public: @@ -163,7 +186,7 @@ if ( ! it->status().isKept() ) continue; - if ( newLocks_r.find( it->satSolvable().ident() ) != newLocks_r.end() ) + if ( autoSoftLockAppliesTo( it->satSolvable() ) ) it->status().setSoftLock( ResStatus::USER ); else it->status().resetTransact( ResStatus::USER ); @@ -172,7 +195,7 @@ void getActiveSoftLocks( AutoSoftLocks & activeLocks_r ) { - activeLocks_r = _autoSoftLocks; // currentsoft-locks + activeLocks_r = _autoSoftLocks; // current soft-locks AutoSoftLocks todel; // + names to be deleted AutoSoftLocks toins; // - names to be installed @@ -180,7 +203,7 @@ { ResStatus & status( it->status() ); if ( ! status.isByUser() ) - continue; + continue; // ignore non-uer requests switch ( status.getTransactValue() ) { @@ -212,7 +235,12 @@ if ( _storeDirty ) { sat::Pool pool( satpool() ); + bool addedItems = false; +#ifdef HARDLOCKTEST +#warning REMOVE FAKE REMOVE FAKE REMOVE FAKE REMOVE FAKE + addedItems = true; +#endif if ( pool.capacity() != _store.capacity() ) { _store.resize( pool.capacity() ); @@ -233,19 +261,24 @@ { // new PoolItem to add pi = PoolItem::makePoolItem( s ); // the only way to create a new one! - // and a few checks... - if ( hardLockAppliesTo( s ) ) - { - pi.status().setLock( true, ResStatus::USER ); - } - else if ( autoSoftLockAppliesTo( s ) ) + // and on the fly check for wek locks... + if ( autoSoftLockAppliesTo( s ) ) { pi.status().setSoftLock( ResStatus::USER ); } + if ( !addedItems ) + addedItems = true; } } } _storeDirty = false; + + // Now, as the pool is adjusted, we must reapply those query + // based hard locks... + if ( addedItems ) + { + reapplyHardLocks(); + } } return _store; } @@ -304,6 +337,8 @@ private: /** Set of solvable idents that should be soft locked per default. */ AutoSoftLocks _autoSoftLocks; + /** Set of queries that define hardlocks. */ + HardLockQueries _hardLockQueries; }; /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/pool/PoolTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/pool/PoolTraits.h?r… ============================================================================== --- trunk/libzypp/zypp/pool/PoolTraits.h (original) +++ trunk/libzypp/zypp/pool/PoolTraits.h Tue Apr 29 18:19:41 2008 @@ -27,6 +27,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + class PoolQuery; + /////////////////////////////////////////////////////////////////// namespace pool { ///////////////////////////////////////////////////////////////// @@ -138,13 +140,17 @@ typedef transform_iterator<Id2ItemValueSelector, Id2ItemT::const_iterator> byIdent_iterator; - /* list of known Repositories */ + /** list of known Repositories */ typedef sat::Pool::RepositoryIterator repository_iterator; - /* soft locks */ + /** soft locks */ typedef std::tr1::unordered_set<IdString> AutoSoftLocks; typedef AutoSoftLocks::const_iterator autoSoftLocks_iterator; + /** hard locks from etc/zypp/locks */ + typedef std::list<PoolQuery> HardLockQueries; + typedef HardLockQueries::const_iterator hardLockQueries_iterator; + typedef PoolImpl Impl; typedef shared_ptr<PoolImpl> Impl_Ptr; typedef shared_ptr<const PoolImpl> Impl_constPtr; Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.c… ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Tue Apr 29 18:19:41 2008 @@ -117,7 +117,7 @@ // path: directory where to look // name,version,release: Script name must match 'name-version.release-' prefix // -#warning nedds to be reimplemented excetion safe +#warning needs to be reimplemented exception safe void RunUpdateScript(Pathname path, std::string name, std::string version, std::string release) { // open the scripts directory -- 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] r9889 - /trunk/libzypp/CMakeLists.txt
by coolo＠svn.opensuse.org 29 Apr '08

29 Apr '08

Author: coolo Date: Tue Apr 29 18:18:01 2008 New Revision: 9889 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9889&view=rev Log: hopefully fix build in beta Modified: trunk/libzypp/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=9889&… ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Tue Apr 29 18:18:01 2008 @@ -2,6 +2,7 @@ SET( PACKAGE "libzypp" ) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) +cmake_minimum_required(VERSION 2.4.5) INCLUDE(ZyppCommon) INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0