April 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r9328 - in /trunk/libzypp: package/libzypp.changes zypp/sat/Solvable.cc zypp/sat/Solvable.h zypp/sat/WhatProvides.cc zypp/sat/WhatProvides.h zypp/sat/detail/PoolImpl.cc zypp/sat/detail/PoolMember.h
by mlandres＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: mlandres Date: Tue Apr 1 22:03:24 2008 New Revision: 9328 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9328&view=rev Log: - Extend sat::WhatProvides to allow to query for possible providers of a collection of capabilies. E.g. all providers of a packages requirements. - Fixed retrieval of translated texts from .solv files, provided the solv file contains them. Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/sat/Solvable.cc trunk/libzypp/zypp/sat/Solvable.h trunk/libzypp/zypp/sat/WhatProvides.cc trunk/libzypp/zypp/sat/WhatProvides.h trunk/libzypp/zypp/sat/detail/PoolImpl.cc trunk/libzypp/zypp/sat/detail/PoolMember.h 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 Tue Apr 1 22:03:24 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Tue Apr 1 21:54:10 CEST 2008 - ma(a)suse.de + +- Extend sat::WhatProvides to allow to query for possible providers + of a collection of capabilies. E.g. all providers of a packages + requirements. +- Fixed retrieval of translated texts from .solv files, provided the + solv file contains them. +- revision 9328 + +------------------------------------------------------------------- Tue Apr 1 16:17:44 CEST 2008 - jreidinger(a)suse.cz - initial implementation of serialize/recovery PoolQuery Modified: trunk/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.cc?rev… ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.cc (original) +++ trunk/libzypp/zypp/sat/Solvable.cc Tue Apr 1 22:03:24 2008 @@ -30,7 +30,7 @@ namespace sat { ///////////////////////////////////////////////////////////////// - const Solvable Solvable::nosolvable; + const Solvable Solvable::noSolvable; ///////////////////////////////////////////////////////////////// @@ -46,7 +46,7 @@ Solvable Solvable::nextInRepo() const { - NO_SOLVABLE_RETURN( nosolvable ); + NO_SOLVABLE_RETURN( noSolvable ); for ( detail::SolvableIdType next = _id+1; next < unsigned(_solvable->repo->end); ++next ) { ::_Solvable * nextS( myPool().getSolvable( next ) ); @@ -55,7 +55,7 @@ return Solvable( next ); } } - return nosolvable; + return noSolvable; } Repository Solvable::repository() const @@ -65,7 +65,10 @@ } bool Solvable::isSystem() const - { return repository().isSystemRepo(); } + { + NO_SOLVABLE_RETURN( _id == detail::systemSolvableId ); + return Repository( _solvable->repo ).isSystemRepo(); + } IdString Solvable::ident() const { @@ -76,26 +79,35 @@ std::string Solvable::lookupStrAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( std::string() ); - const char *s = ::repo_lookup_str( _solvable, attr.idStr().id() ); - return s ? s : std::string(); + const char * s = ::solvable_lookup_str( _solvable, attr.idStr().id() ); + return s ? s : std::string(); } std::string Solvable::lookupStrAttribute( const SolvAttr & attr, const Locale & lang_r ) const { -#warning FIX RETRIEVIENG TRANSLATIONS - return lookupStrAttribute( attr ); + NO_SOLVABLE_RETURN( std::string() ); + const char * s = 0; + if ( lang_r == Locale::noCode ) + { + s = ::solvable_lookup_str_poollang( _solvable, attr.idStr().id() ); + } + else + { + s = ::solvable_lookup_str_lang( _solvable, attr.idStr().id(), lang_r.code().c_str() ); + } + return s ? s : std::string(); } unsigned Solvable::lookupNumAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( 0 ); - return ::repo_lookup_num( _solvable, attr.idStr().id() ); + return ::solvable_lookup_num( _solvable, attr.idStr().id(), 0 ); } bool Solvable::lookupBoolAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( false ); - return ::repo_lookup_num( _solvable, attr.idStr().id() ); + return ::solvable_lookup_bool( _solvable, attr.idStr().id() ); } std::string Solvable::lookupLocation(unsigned &medianr) const @@ -399,7 +411,7 @@ std::ostream & operator<<( std::ostream & str, const Solvable & obj ) { if ( ! obj ) - return str << "sat::solvable()"; + return str << (obj.isSystem() ? "systemSolvable" : "noSolvable" ); return str << "(" << obj.id() << ")" << ( obj.isKind( ResKind::srcpackage ) ? "srcpackage:" : "" ) << obj.ident() Modified: trunk/libzypp/zypp/sat/Solvable.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/Solvable.h?rev=… ============================================================================== --- trunk/libzypp/zypp/sat/Solvable.h (original) +++ trunk/libzypp/zypp/sat/Solvable.h Tue Apr 1 22:03:24 2008 @@ -49,8 +49,6 @@ * \ref Solvable will hide this inconsistency by treating source * packages as an own kind of solvable and map their arch to * \ref Arch_noarch. - * - * */ class Solvable : protected detail::PoolMember, private base::SafeBool<Solvable> @@ -59,7 +57,7 @@ typedef sat::detail::SolvableIdType IdType; public: - /** Default ctor creates \ref nosolvable.*/ + /** Default ctor creates \ref noSolvable.*/ Solvable() : _id( detail::noSolvableId ) {} @@ -69,12 +67,14 @@ public: /** Represents no \ref Solvable. */ - static const Solvable nosolvable; + static const Solvable noSolvable; - /** Evaluate \ref Solvable in a boolean context (\c != \c nosolvable). */ + /** Evaluate \ref Solvable in a boolean context (\c != \c noSolvable). */ using base::SafeBool<Solvable>::operator bool_type; - /** Return whether this \ref Solvable belongs to the system repo. */ + /** Return whether this \ref Solvable belongs to the system repo. + * \note This includes the otherwise hidden systemSolvable. + */ bool isSystem() const; /** The \ref Repository this \ref Solvable belongs to. */ @@ -89,11 +89,13 @@ std::string lookupStrAttribute( const SolvAttr & attr ) const; /** \overload Trying to look up a translated string attribute. * + * Returns the translation for \c lang_r (\b no fallback locales). + * * Passing an empty \ref Locale will return the string for the - * current default locale (\see \ref ZConfig::defaultTextLocale). + * current default locale (\see \ref ZConfig::defaultTextLocale), + * \b considering all fallback locales. * - * Returns the translation for \c lang_r considering all fallback - * locales. Returns an empty string if no translation is available. + * Returns an empty string if no translation is available. */ std::string lookupStrAttribute( const SolvAttr & attr, const Locale & lang_r ) const; @@ -175,9 +177,9 @@ //@} public: - /** Return next Solvable in \ref Pool (or \ref nosolvable). */ + /** Return next Solvable in \ref Pool (or \ref noSolvable). */ Solvable nextInPool() const; - /** Return next Solvable in \ref Repo (or \ref nosolvable). */ + /** Return next Solvable in \ref Repo (or \ref noSolvable). */ Solvable nextInRepo() const; public: Modified: trunk/libzypp/zypp/sat/WhatProvides.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatProvides.cc… ============================================================================== --- trunk/libzypp/zypp/sat/WhatProvides.cc (original) +++ trunk/libzypp/zypp/sat/WhatProvides.cc Tue Apr 1 22:03:24 2008 @@ -10,8 +10,9 @@ * */ #include <iostream> -#include "zypp/base/LogTools.h" +#include <tr1/unordered_set> +#include "zypp/base/LogTools.h" #include "zypp/sat/WhatProvides.h" #include "zypp/sat/detail/PoolImpl.h" @@ -24,21 +25,54 @@ namespace sat { ///////////////////////////////////////////////////////////////// - WhatProvides::WhatProvides( Capability cap_r ) - : _begin( myPool().whatProvides( cap_r ) ) - { -#warning REMOVE THIS DEBUGSTUFF AGAIN - if ( ! _begin ) - return; - int limit = myPool()->nsolvables; - for ( const sat::detail::IdType * end = _begin; *end; ++end ) + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + + /** WhatProvides ctor helper collecting providers from Capabilies. */ + template <class Iterator> + shared_ptr<void> allocatedProviders( Iterator begin_r, Iterator end_r, const sat::detail::IdType *& first_r ) { - if ( *end >= limit ) + // use a set to unify the collected results + std::tr1::unordered_set<sat::detail::IdType> ids; + for_( it, begin_r, end_r ) { - INT << "Illegal index: WhatProvides (" << cap_r << ") = " << *end << " (limit " << limit << ")" << endl; + WhatProvides providers( *it ); + for_( prv, providers.begin(), providers.end() ) + { + ids.insert( prv->id() ); + } } + + if ( ids.empty() ) + { + return shared_ptr<void>(); + } + + // use allocated private data to store the result + std::vector<sat::detail::IdType> * pdata = new std::vector<sat::detail::IdType>( ids.size(), sat::detail::noId ); + pdata->insert( pdata->begin(), ids.begin(), ids.end() ); + first_r = &pdata->front(); + return shared_ptr<void>( pdata ); } - } + + ///////////////////////////////////////////////////////////////// + } // namespace + /////////////////////////////////////////////////////////////////// + + WhatProvides::WhatProvides( Capability cap_r ) + : _begin( myPool().whatProvides( cap_r ) ) + {} + + WhatProvides::WhatProvides( Capabilities caps_r ) + : _begin( 0 ) + , _private( allocatedProviders( caps_r.begin(), caps_r.end(), _begin ) ) + {} + + WhatProvides::WhatProvides( const CapabilitySet & caps_r ) + : _begin( 0 ) + , _private( allocatedProviders( caps_r.begin(), caps_r.end(), _begin ) ) + {} WhatProvides::size_type WhatProvides::size() const { Modified: trunk/libzypp/zypp/sat/WhatProvides.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/WhatProvides.h?… ============================================================================== --- trunk/libzypp/zypp/sat/WhatProvides.h (original) +++ trunk/libzypp/zypp/sat/WhatProvides.h Tue Apr 1 22:03:24 2008 @@ -13,8 +13,9 @@ #define ZYPP_SAT_WHATPROVIDES_H #include <iosfwd> +#include <vector> -#include "zypp/base/DefaultIntegral.h" +#include "zypp/base/PtrTypes.h" #include "zypp/sat/detail/PoolMember.h" #include "zypp/sat/Solvable.h" @@ -30,14 +31,50 @@ // CLASS NAME : WhatProvides // /** Container of \ref Solvable providing a \ref Capability (read only). + * * \code * Capability cap("amarok < 1.13"); + * * WhatProvides q( cap ); + * Solvable firstMatch; + * * if ( ! q.empty() ) * { * cout << "Found " << q.size() << " matches for " << cap << ":" << endl; + * firstMatch = *q.begin(); + * * for_( it, q.begin(), q.end() ) - * cout << *it << end; + * cout << *it << endl; + * } + * + * if ( firstMatch ) + * { + * WhatProvides req( firstMatch.requires() ); + * if ( ! req.empty() ) + * { + * cout << "Found " << req.size() << " items providing requirements of " << firstMatch << ":" << endl; + * } + * } + * \endcode + * + * \note Note that there are capabilities which are not provided by any \ref Solvable, + * but are system properties. For example: + * \code + * rpmlib(PayloadIsBzip2) <= 3.0.5-1 + * \endcode + * In that case a \ref Solvable::noSolvable is returned, which has \c isSystem set \c true, although + * there should never be a \ref Solvable::noSolvable returned with \c isSystem set \c false. If so, + * please file a bugreport. + * \code + * WhatProvides q( Capability("rpmlib(PayloadIsBzip2) <= 3.0.5-1") ); + * for_( it, q.begin(), q.end() ) + * { + * if ( *it ) + * cout << "Capability is provided by package " << *it << endl; + * else if ( it->isSystem() ) + * cout << "Capability is a system property" << endl; + * else + * ; // never reaching this \c else * } * \endcode */ @@ -53,11 +90,19 @@ : _begin( 0 ) {} - /** Ctor from Id pointer (friend \ref Solvable). */ + /** Ctor from \ref Capability. */ explicit WhatProvides( Capability cap_r ); - public: + /** Ctor collecting all providers of capabilities in \c caps_r. */ + explicit + WhatProvides( Capabilities caps_r ); + + /** Ctor collecting all providers of capabilities in \c caps_r. */ + explicit + WhatProvides( const CapabilitySet & caps_r ); + + public: /** Whether the container is empty. */ bool empty() const { return ! ( _begin && *_begin ); } @@ -76,6 +121,7 @@ private: const sat::detail::IdType * _begin; + shared_ptr<void> _private; }; /////////////////////////////////////////////////////////////////// @@ -109,7 +155,7 @@ friend class boost::iterator_core_access; reference dereference() const - { return ( base() ) ? Solvable( *base() ) : Solvable::nosolvable; } + { return ( base() ) ? Solvable( *base() ) : Solvable::noSolvable; } template <class OtherDerived, class OtherIterator, class V, class C, class R, class D> bool equal( const boost::iterator_adaptor<OtherDerived, OtherIterator, V, C, R, D> & rhs ) const Modified: trunk/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolImpl… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ trunk/libzypp/zypp/sat/detail/PoolImpl.cc Tue Apr 1 22:03:24 2008 @@ -45,6 +45,9 @@ BOOST_MPL_ASSERT_RELATION( noId, ==, STRID_NULL ); BOOST_MPL_ASSERT_RELATION( emptyId, ==, STRID_EMPTY ); + BOOST_MPL_ASSERT_RELATION( noSolvableId, ==, ID_NULL ); + BOOST_MPL_ASSERT_RELATION( systemSolvableId, ==, SYSTEMSOLVABLE ); + BOOST_MPL_ASSERT_RELATION( solvablePrereqMarker, ==, SOLVABLE_PREREQMARKER ); BOOST_MPL_ASSERT_RELATION( solvableFileMarker, ==, SOLVABLE_FILEMARKER ); @@ -161,6 +164,22 @@ ::pool_addfileprovides( _pool, sat::Pool::instance().systemRepo().get() ); ::pool_createwhatprovides( _pool ); } + if ( ! _pool->languages ) + { + std::vector<std::string> fallbacklist; + for ( Locale l( ZConfig::instance().textLocale() ); l != Locale::noCode; l = l.fallback() ) + { + fallbacklist.push_back( l.code() ); + } + dumpRangeLine( MIL << "pool_set_languages: ", fallbacklist.begin(), fallbacklist.end() ) << endl; + + std::vector<const char *> fallbacklist_cstr; + for_( it, fallbacklist.begin(), fallbacklist.end() ) + { + fallbacklist_cstr.push_back( it->c_str() ); + } + ::pool_set_languages( _pool, &fallbacklist_cstr.front(), fallbacklist_cstr.size() ); + } } /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/sat/detail/PoolMember.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/detail/PoolMemb… ============================================================================== --- trunk/libzypp/zypp/sat/detail/PoolMember.h (original) +++ trunk/libzypp/zypp/sat/detail/PoolMember.h Tue Apr 1 22:03:24 2008 @@ -41,14 +41,14 @@ class Capability; class Capabilities; class Repository; - class RepoInfo; + class RepoInfo; /////////////////////////////////////////////////////////////////// namespace detail - { + { class RepoIterator; - class ByRepository; - } + class ByRepository; + } /////////////////////////////////////////////////////////////////// namespace sat @@ -106,12 +106,14 @@ */ typedef unsigned SolvableIdType; typedef SolvableIdType size_type; - /** Id to denote \ref Solvable::nosolvable. */ + /** Id to denote \ref Solvable::noSolvable. */ static const SolvableIdType noSolvableId( 0 ); + /** Id to denote the usually hidden \ref Solvable::systemSolvable. */ + static const SolvableIdType systemSolvableId( 1 ); /** Id type to connect \ref Repo and sat-repo. */ typedef ::_Repo * RepoIdType; - /** Id to denote \ref Repo::nosolvable. */ + /** Id to denote \ref Repo::noRepository. */ static const RepoIdType noRepoId( 0 ); ///////////////////////////////////////////////////////////////// -- 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] r9327 - in /trunk/zypper: doc/zypper.8 src/zypper-misc.cc
by jkupec＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jkupec Date: Tue Apr 1 21:47:12 2008 New Revision: 9327 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9327&view=rev Log: - disable the --force-resolution by default also for 'update' (bnc #369980) - will check how rug behaves later Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=9327&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Tue Apr 1 21:47:12 2008 @@ -199,7 +199,11 @@ .TP .I \-R, \-\-force\-resolution Force the solver to find a solution, even if it would mean removing all packages -with unfulfilled requirements. +with unfulfilled requirements. Otherwise it reports +a dependency problem and prompt the user to resolve it manually. + +The default value is 'on' in the interactive mode and 'off' in the +non-interactive mode. If this option is specified, it takes the preference. .TP .I \-D, \-\-dry\-run Test the removal of packages, do not actually remove anything. This option will @@ -232,7 +236,10 @@ .TP .I \-R, \-\-force\-resolution Force the solver to find a solution, even if it would mean removing all packages -with unfulfilled requirements. +with unfulfilled requirements. Otherwise it reports +a dependency problem and prompt the user to resolve it manually. + +The default value is 'off'. If this option is specified, it takes the preference. .TP .I \-D, \-\-dry\-run Test the update, do not actually install or update any package. This option will @@ -659,7 +666,7 @@ .LP zypper is designed to be compatible with rug, which is a command\-line interface to the ZENworks Linux Management (ZLM) agent. Compared to rug, zypper does not need the ZLM daemon to run, and is intented to provide more and improved functionality. Following is a list of zypper-rug command aliases, supported rug command line options, and compatibility notes. See also compatibility notes in descriptions of zypper commands. .LP -To enable rug compatible behavior, use the \-r or \-\-rug\-compatible global option with each command. +To enable rug-compatible behavior, use the \-r or \-\-rug\-compatible global option with each command. .SS Service Management Commands .LP @@ -700,7 +707,7 @@ .TP .I \-R, \-\-force\-resolution <on|off> This option is not available in rug and zypper uses the 'force-resolution' -solver mode by default when running rug in compatible mode. However, it is +solver mode by default when running in rug-compatible mode. However, it is possible to turn the forcing of resolution off using this option even in rug-compatible mode. .RE @@ -715,7 +722,7 @@ .TP .I \-R, \-\-force\-resolution <on|off> This option is not available in rug and zypper uses the 'force-resolution' -solver mode by default when running rug in compatible mode. However, it is +solver mode by default when running in rug-compatible mode. However, it is possible to turn the forcing of resolution off using this option even in rug-compatible mode. .RE @@ -742,7 +749,7 @@ .TP .I \-R, \-\-force\-resolution <on|off> This option is not available in rug and zypper uses the 'force-resolution' -solver mode by default when running rug in compatible mode. However, it is +solver mode by default when running in rug-compatible mode. However, it is possible to turn the forcing of resolution off using this option even in rug-compatible mode. .RE Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=93… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Apr 1 21:47:12 2008 @@ -1072,16 +1072,19 @@ } // if --force-resolution was not specified on the command line, force - // the resolution by default, don't force it only in non-interactive mode - // and not rug_compatible mode + // the resolution by default for the install and remove commands and the + // rug_compatible mode. Don't force resolution in non-interactive mode + // and for update and dist-upgrade command (complex solver request). + // bnc #369980 if (indeterminate(force_resolution)) { - if ((zypper.globalOpts().non_interactive && - !zypper.globalOpts().is_rug_compatible) || - zypper.command() == ZypperCommand::DIST_UPGRADE) // bnc #369980 - force_resolution = false; - else + if (!zypper.globalOpts().non_interactive && + (zypper.globalOpts().is_rug_compatible || + zypper.command() == ZypperCommand::INSTALL || + zypper.command() == ZypperCommand::REMOVE)) force_resolution = true; + else + force_resolution = false; } DBG << "force resolution: " << force_resolution << endl; -- 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] r9326 - /trunk/libzypp/package/libzypp.changes
by jreidinger＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jreidinger Date: Tue Apr 1 16:17:15 2008 New Revision: 9326 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9326&view=rev Log: changes 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 Tue Apr 1 16:17:15 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 1 16:17:44 CEST 2008 - jreidinger(a)suse.cz + +- initial implementation of serialize/recovery PoolQuery + (needed by FATE #120118) +- revision 9325 + +------------------------------------------------------------------- Wed Mar 26 16:15:24 CET 2008 - ma(a)suse.de - Allow prioritizing repos by adding a line 'priority=N' to the -- 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] r9325 - in /trunk/libzypp: VERSION.cmake tests/zypp/PoolQuery_test.cc tests/zypp/data/PoolQuery/savedqueries zypp/PoolQuery.cc zypp/PoolQuery.h zypp/PoolQueryUtil.h
by jreidinger＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jreidinger Date: Tue Apr 1 16:14:13 2008 New Revision: 9325 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9325&view=rev Log: initial implementation of serialize/recovery PoolQuery (needed by FATE #120118) Added: trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries trunk/libzypp/zypp/PoolQueryUtil.h Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/tests/zypp/PoolQuery_test.cc trunk/libzypp/zypp/PoolQuery.cc trunk/libzypp/zypp/PoolQuery.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=9325&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Apr 1 16:14:13 2008 @@ -45,6 +45,6 @@ # SET(LIBZYPP_MAJOR "4") -SET(LIBZYPP_MINOR "6") +SET(LIBZYPP_MINOR "7") SET(LIBZYPP_COMPATMINOR "6") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "0") 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 1 16:14:13 2008 @@ -1,9 +1,13 @@ #include <stdio.h> #include <iostream> +#include <iterator> #include <boost/test/auto_unit_test.hpp> +#include <list> #include "zypp/ZYppFactory.h" #include "zypp/PoolQuery.h" +#include "zypp/PoolQueryUtil.h" +#include "zypp/TmpPath.h" #define BOOST_TEST_MODULE PoolQuery @@ -43,4 +47,38 @@ cout << "search done." << endl; #endif + +//test recovery from file + Pathname pathToQueries(TESTS_SRC_DIR); + pathToQueries += "/zypp/data/PoolQuery/savedqueries"; + + std::list<PoolQuery> savedQueries; + + std::insert_iterator<std::list<PoolQuery> > ii(savedQueries, savedQueries.end()); + readPoolQueriesFromFile(pathToQueries,ii); + BOOST_CHECK( savedQueries.size() == 2 ); + + filesystem::TmpFile tmp; + Pathname tmpPath = tmp.path(); + + savedQueries.clear(); + + PoolQuery q1; + PoolQuery q2; + + q1.addKind( Resolvable::Kind::patch ); + q2.addKind( Resolvable::Kind::patch ); + q2.addKind( Resolvable::Kind::pattern ); + + savedQueries.push_front( q1 ); + savedQueries.push_front( q2 ); + + writePoolQueriesToFile ( tmpPath, savedQueries.begin(), savedQueries.end() ); + std::insert_iterator<std::list<PoolQuery> > ii2(savedQueries, + savedQueries.end()); + //reread writed queries + readPoolQueriesFromFile( tmpPath, ii2); + //TODO test if 0==2 and 1==3 + BOOST_CHECK( savedQueries.size() == 4 ); + } Added: trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/data/PoolQuer… ============================================================================== --- trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries (added) +++ trunk/libzypp/tests/zypp/data/PoolQuery/savedqueries Tue Apr 1 16:14:13 2008 @@ -0,0 +1,5 @@ +#repo cannot be tested due to possibly missing allias +kind: patch + +kind: product +kind: pattern Modified: trunk/libzypp/zypp/PoolQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.cc?rev=93… ============================================================================== --- trunk/libzypp/zypp/PoolQuery.cc (original) +++ trunk/libzypp/zypp/PoolQuery.cc Tue Apr 1 16:14:13 2008 @@ -22,6 +22,7 @@ #include "zypp/sat/Pool.h" #include "zypp/sat/Solvable.h" +#include "zypp/sat/SolvAttr.h" extern "C" { @@ -198,6 +199,148 @@ { return str; } + + + /** + * represents all atributes in PoolQuery except SolvAtributes, which is + * used as is (not needed extend anythink if someone add new solv attr) + */ + struct PoolQueryAttr : public IdStringType<PoolQueryAttr> + { + private: + friend class IdStringType<PoolQueryAttr>; + IdString _str; + + public: + + //noAttr + PoolQueryAttr():isSolvAttr(false){} + + explicit PoolQueryAttr( const char* cstr_r ) + : _str( cstr_r ),isSolvAttr(false){} + + explicit PoolQueryAttr( const std::string & str_r ) + : _str( str_r ),isSolvAttr(false) + { + if( _str==noAttr ){ + sat::SolvAttr sa(str_r); + if( sa != sat::SolvAttr::noAttr ) + { + isSolvAttr = true; + } + } + } + + //unknown atributes + static const PoolQueryAttr noAttr; + + // own attributes + static const PoolQueryAttr nameAttr; + static const PoolQueryAttr repoAttr; + static const PoolQueryAttr kindAttr; + + // exported attributes from SolvAtributes + bool isSolvAttr; + }; + + const PoolQueryAttr PoolQueryAttr::noAttr; + + const PoolQueryAttr PoolQueryAttr::nameAttr( "name" ); + const PoolQueryAttr PoolQueryAttr::repoAttr( "repo" ); + const PoolQueryAttr PoolQueryAttr::kindAttr( "kind" ); + + //\TODO maybe ctor with stream can be usefull + bool PoolQuery::recover( istream &str, char delim ) + { + bool finded_something = false; //indicates some atributes is finded + string s; + do { + if ( str.eof() ) + break; + + getline( str, s, delim ); + + if ((!s.empty()) && s[0]=='#') //comment + { + continue; + } + + string::size_type pos = s.find(':'); + if (s.empty() || pos == s.npos) // some garbage on line... act like blank line + { + if (finded_something) //is first blank line after record? + { + break; + } + else + { + continue; + } + } + + finded_something = true; + + string atrName(str::trim(string(s,0,pos))); // trimmed name of atribute + string atrValue(str::trim(string(s,pos+1,s.npos))); //trimmed value + + PoolQueryAttr attribute( atrName ); + + if ( attribute==PoolQueryAttr::nameAttr) + { + //setName...maybe some regex test + break; + } + else if ( attribute==PoolQueryAttr::repoAttr ) + { + addRepo( atrValue ); + } + else if ( attribute==PoolQueryAttr::kindAttr ) + { + addKind( Resolvable::Kind(atrValue) ); + } + else if ( attribute==PoolQueryAttr::noAttr ) + { + if (attribute.isSolvAttr) + { + //setAtribute + } + else + { + //log unknwon atribute + } + } + else + { + //some forget handle new atribute + ; + } + + } while ( true ); + + return finded_something; + } + + void PoolQuery::serialize( ostream &str, char delim ) + { + //separating delim + str << delim; + //iterate thrue all settings and write it + + for_( it, _pimpl->_repos.begin(), _pimpl->_repos.end() ) + { + str << "repo: " << *it << delim ; + } + + for_( it, _pimpl->_kinds.begin(), _pimpl->_kinds.end() ) + { + str << "kind: " << it->idStr() << delim ; + } + + //separating delim - protection + str << delim; + + } + ///////////////////////////////////////////////////////////////// } // namespace zypp Modified: trunk/libzypp/zypp/PoolQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=932… ============================================================================== --- trunk/libzypp/zypp/PoolQuery.h (original) +++ trunk/libzypp/zypp/PoolQuery.h Tue Apr 1 16:14:13 2008 @@ -173,6 +173,28 @@ // a forEach method consuming a functor can be added here, too + /** + * Reads from stream query. Attributes is sepated by delim. Query is + * separated by two delim. + * + * \param str input stream which contains query + * \param delim delimeter for attributes + * \return true if non-empty query is recovered + * + * \see readPoolQueriesFromFile + */ + bool recover( std::istream &str, char delim = '\n' ); + + /** + * Writes query to stream, As delimeter is used delim. + * + * \param str output stream for query + * \param delim delimeter for attributes + * + * \see writePoolQueriesToFile + */ + void serialize( std::ostream &str, char delim = '\n' ); + public: class Impl; private: @@ -181,6 +203,7 @@ }; + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp/PoolQueryUtil.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQueryUtil.h?rev… ============================================================================== --- trunk/libzypp/zypp/PoolQueryUtil.h (added) +++ trunk/libzypp/zypp/PoolQueryUtil.h Tue Apr 1 16:14:13 2008 @@ -0,0 +1,59 @@ +// including fstream is not hell here because this header only included +// by implementation file, header doesn't need include it +// also that's why this file is not protected by IFNDEF (you get it +// only when you explicitly need it in implementation) +#include <fstream> + +#include "zypp/Pathname.h" +#include "zypp/PoolQuery.h" + + /** + * sends to output iterator all queries readed from file. + * + * \code + * list<PoolQuery> s; + * insert_iterator<list<PoolQuery> > ii(s, s.end()); + * readPoolQueriesFromStream(f,ii); + * \endcode + */ + template <class OutputIterator> + void readPoolQueriesFromFile(const zypp::filesystem::Pathname &file, + OutputIterator out ) + { + bool found; + std::ifstream fin( file.c_str() ); + + if (!fin) + return; //TODO exception + + do + { + zypp::PoolQuery q; + found = q.recover( fin ); + if (found) + *out++ = q; + } while ( found ); + + fin.close(); + } + + /** + * Writes all queries from begin to end. + */ + + template <class InputIterator> + void writePoolQueriesToFile(const zypp::filesystem::Pathname &file, + InputIterator begin, InputIterator end ) + { + std::ofstream fout( file.c_str(), std::ios_base::out | std::ios_base::trunc ); + + if (!fout) + return; //TODO exception + + for_( it, begin, end ) + { + it->serialize( fout ); + } + + fout.close(); + } -- 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] r9324 - in /trunk/libzypp/zypp/solver/detail: Testcase.cc Testcase.h
by schubi2＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: schubi2 Date: Tue Apr 1 15:31:29 2008 New Revision: 9324 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9324&view=rev Log: take care about the forceResolve in the testcases Modified: trunk/libzypp/zypp/solver/detail/Testcase.cc trunk/libzypp/zypp/solver/detail/Testcase.h Modified: trunk/libzypp/zypp/solver/detail/Testcase.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Testc… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Testcase.cc (original) +++ trunk/libzypp/zypp/solver/detail/Testcase.cc Tue Apr 1 15:31:29 2008 @@ -378,7 +378,9 @@ HelixControl control (dumpPath + "/solver-test.xml", repoTable, ZConfig::instance().systemArchitecture(), - pool.getRequestedLocales()); + pool.getRequestedLocales(), + "solver-system.xml.gz", + resolver.forceResolve()); for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) { control.installResolvable (iter->resolvable(), iter->status()); @@ -432,7 +434,8 @@ const RepositoryTable & repoTable, const Arch & systemArchitecture, const LocaleSet &languages, - const std::string & systemPath) + const std::string & systemPath, + const bool forceResolve) :dumpFile (controlPath) { file = new ofstream(controlPath.c_str()); @@ -468,6 +471,10 @@ *file << TAB << "<locale name=\"" << iter->code() << "\" />" << endl; } + + if (forceResolve) + *file << TAB << "<forceResolve/>" << endl; + *file << "</setup>" << endl << "<trial>" << endl << "<showpool all=\"yes\"/>" << endl; Modified: trunk/libzypp/zypp/solver/detail/Testcase.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Testc… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Testcase.h (original) +++ trunk/libzypp/zypp/solver/detail/Testcase.h Tue Apr 1 15:31:29 2008 @@ -103,7 +103,8 @@ const RepositoryTable & sourceTable, const Arch & systemArchitecture, const LocaleSet &languages, - const std::string & systemPath = "solver-system.xml.gz"); + const std::string & systemPath = "solver-system.xml.gz", + const bool forceResolve = false); HelixControl (); ~HelixControl (); -- 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] r9323 - /trunk/zypper/src/zypper-misc.cc
by jkupec＠svn.opensuse.org 01 Apr '08

01 Apr '08

Author: jkupec Date: Tue Apr 1 12:24:45 2008 New Revision: 9323 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9323&view=rev Log: - don't force resolution on dist-upgrade (#369980) Modified: trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=93… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Apr 1 12:24:45 2008 @@ -1076,8 +1076,9 @@ // and not rug_compatible mode if (indeterminate(force_resolution)) { - if (zypper.globalOpts().non_interactive && - !zypper.globalOpts().is_rug_compatible) + if ((zypper.globalOpts().non_interactive && + !zypper.globalOpts().is_rug_compatible) || + zypper.command() == ZypperCommand::DIST_UPGRADE) // bnc #369980 force_resolution = false; else force_resolution = true; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0