August 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : Create misc subdirectory
by Michael Andres 04 Aug '09

04 Aug '09

ref: refs/heads/master commit d7ecdc1232a8b6381b9266a06053970e6aab1eb7 Author: Michael Andres <ma(a)suse.de> Date: Tue Aug 4 16:18:36 2009 +0200 Create misc subdirectory --- zypp/CMakeLists.txt | 16 +++++- zypp/Misc.cc | 111 ---------------------------------------- zypp/Misc.h | 63 ---------------------- zypp/misc/DefaultLoadSystem.cc | 111 ++++++++++++++++++++++++++++++++++++++++ zypp/misc/DefaultLoadSystem.h | 63 ++++++++++++++++++++++ 5 files changed, 188 insertions(+), 176 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 846e3cb..dae0fd9 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -32,7 +32,6 @@ SET( zypp_SRCS Locks.cc MediaProducts.cc MediaSetAccess.cc - Misc.cc NameKindProxy.cc OnMediaLocation.cc Package.cc @@ -120,7 +119,6 @@ SET( zypp_HEADERS ManagedFile.h MediaProducts.h MediaSetAccess.h - Misc.h NameKindProxy.h Vendor.h OnMediaLocation.h @@ -761,8 +759,21 @@ SET( zypp_ws_HEADERS ws/WebpinResult.h ) +#################################################################### + +SET( zypp_misc_HEADERS + Misc.h + misc/DefaultLoadSystem.h +) + +SET( zypp_misc_SRCS + misc/DefaultLoadSystem.cc +) + +#################################################################### SET( zypp_lib_SRCS +${zypp_misc_SRCS} ${zypp_pool_SRCS} ${zypp_parser_susetags_SRCS} ${zypp_parser_xml_SRCS} @@ -820,6 +831,7 @@ ${zypp_source_susetags_HEADERS} ${zypp_target_modalias_HEADERS} ${zypp_target_HEADERS} ${zypp_pool_HEADERS} +${zypp_misc_HEADERS} ) # diff --git a/zypp/Misc.cc b/zypp/Misc.cc deleted file mode 100644 index 8683f6c..0000000 --- a/zypp/Misc.cc +++ /dev/null @@ -1,111 +0,0 @@ -/*---------------------------------------------------------------------\ -| ____ _ __ __ ___ | -| |__ / \ / / . \ . \ | -| / / \ V /| _/ _/ | -| / /__ | | | | | | | -| /_____||_| |_| |_| | -| | -\---------------------------------------------------------------------*/ -/** \file zypp/Misc.cc - * -*/ -#include <iostream> - -#include "zypp/base/LogTools.h" -#include "zypp/PathInfo.h" - -#include "zypp/Misc.h" - -#include "zypp/ZYppFactory.h" -#include "zypp/zypp_detail/ZYppReadOnlyHack.h" -#include "zypp/Target.h" -#include "zypp/RepoManager.h" -#include "zypp/sat/Pool.h" - -using std::endl; - -#undef ZYPP_BASE_LOGGER_LOGGROUP -#define ZYPP_BASE_LOGGER_LOGGROUP "zypp::misc" - -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace misc - { ///////////////////////////////////////////////////////////////// - - void defaultLoadSystem( const Pathname & sysRoot_r, LoadSystemFlags flags_r ) - { - MIL << str::form( "*** Load system at '%s' (%lx)", sysRoot_r.c_str(), (unsigned long)flags_r ) << endl; - - if ( ! PathInfo( sysRoot_r ).isDir() ) - ZYPP_THROW( Exception(str::form("sysRoot_r argument needs to be a directory. (%s)", sysRoot_r.c_str())) ); - - if ( ZYppFactory::instance().haveZYpp() ) - ZYPP_THROW( Exception("ZYpp instance is already created. (Call this method earlier.)") ); - - if ( flags_r.testFlag( LS_READONLY ) ) - zypp_readonly_hack::IWantIt (); - - sat::Pool satpool( sat::Pool::instance() ); - - if ( 1 ) - { - MIL << "*** load target '" << Repository::systemRepoAlias() << "'\t" << endl; - getZYpp()->initializeTarget( sysRoot_r ); - getZYpp()->target()->load(); - MIL << satpool.systemRepo() << endl; - } - - if ( 1 ) - { - RepoManager repoManager( sysRoot_r ); - RepoInfoList repos = repoManager.knownRepositories(); - for_( it, repos.begin(), repos.end() ) - { - RepoInfo & nrepo( *it ); - - if ( ! nrepo.enabled() ) - continue; - - if ( ! flags_r.testFlag( LS_NOREFRESH ) ) - { - if ( repoManager.isCached( nrepo ) - && ( nrepo.type() == repo::RepoType::RPMPLAINDIR // refreshes always - || repoManager.checkIfToRefreshMetadata( nrepo, nrepo.url() ) == RepoManager::REFRESH_NEEDED ) ) - { - MIL << str::form( "*** clean cache for repo '%s'\t", nrepo.name().c_str() ) << endl; - repoManager.cleanCache( nrepo ); - MIL << str::form( "*** refresh repo '%s'\t", nrepo.name().c_str() ) << endl; - repoManager.refreshMetadata( nrepo ); - } - } - - if ( ! repoManager.isCached( nrepo ) ) - { - MIL << str::form( "*** build cache for repo '%s'\t", nrepo.name().c_str() ) << endl; - repoManager.buildCache( nrepo ); - } - - MIL << str::form( "*** load repo '%s'\t", nrepo.name().c_str() ) << std::flush; - try - { - repoManager.loadFromCache( nrepo ); - MIL << satpool.reposFind( nrepo.alias() ) << endl; - } - catch ( const Exception & exp ) - { - ERR << "*** load repo failed: " << exp.asString() + "\n" + exp.historyAsString() << endl; - ZYPP_RETHROW ( exp ); - } - } - } - MIL << str::form( "*** Read system at '%s'", sysRoot_r.c_str() ) << endl; - } - - ///////////////////////////////////////////////////////////////// - } // namespace misc - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// diff --git a/zypp/Misc.h b/zypp/Misc.h deleted file mode 100644 index d8c4c1a..0000000 --- a/zypp/Misc.h +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------\ -| ____ _ __ __ ___ | -| |__ / \ / / . \ . \ | -| / / \ V /| _/ _/ | -| / /__ | | | | | | | -| /_____||_| |_| |_| | -| | -\---------------------------------------------------------------------*/ -/** \file zypp/Misc.h - * -*/ -#ifndef ZYPP_MISC_H -#define ZYPP_MISC_H - -#include <iosfwd> - -#include "zypp/Pathname.h" -#include "zypp/base/Flags.h" - -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace misc - { ///////////////////////////////////////////////////////////////// - - /** - * Bits for tuning \ref defaultLoadSystem. - * - * Use \ref LoadSystemFlags as a type-safe way of - * storing OR-combinations. - */ - enum LoadSystemFlag - { - LS_READONLY = (1 << 0), //!< // Create readonly ZYpp instance. - LS_NOREFRESH = (1 << 1) //!< // Don't refresh existing repos. - }; - - /** \relates LoadSystemFlag Type-safe way of storing OR-combinations. */ - ZYPP_DECLARE_FLAGS_AND_OPERATORS( LoadSystemFlags, LoadSystemFlag ); - - /** - * Create the ZYpp instance and load target and enabled repositories. - * - * \see LoadSystemFlag for options. - * - * \throws Exception on error - * - * \todo properly handle service refreshs - */ - void defaultLoadSystem( const Pathname & sysRoot_r = "/", LoadSystemFlags flags_r = LoadSystemFlags() ); - - /** \overload */ - inline void defaultLoadSystem( LoadSystemFlags flags_r ) - { defaultLoadSystem( "/", flags_r ); } - - ///////////////////////////////////////////////////////////////// - } // namespace misc - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// -#endif // ZYPP_MISC_H diff --git a/zypp/misc/DefaultLoadSystem.cc b/zypp/misc/DefaultLoadSystem.cc new file mode 100644 index 0000000..abb24fb --- /dev/null +++ b/zypp/misc/DefaultLoadSystem.cc @@ -0,0 +1,111 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/misc/DefaultLoadSystem.cc + * +*/ +#include <iostream> + +#include "zypp/base/LogTools.h" +#include "zypp/PathInfo.h" + +#include "zypp/misc/DefaultLoadSystem.h" + +#include "zypp/ZYppFactory.h" +#include "zypp/zypp_detail/ZYppReadOnlyHack.h" +#include "zypp/Target.h" +#include "zypp/RepoManager.h" +#include "zypp/sat/Pool.h" + +using std::endl; + +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "zypp::misc" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace misc + { ///////////////////////////////////////////////////////////////// + + void defaultLoadSystem( const Pathname & sysRoot_r, LoadSystemFlags flags_r ) + { + MIL << str::form( "*** Load system at '%s' (%lx)", sysRoot_r.c_str(), (unsigned long)flags_r ) << endl; + + if ( ! PathInfo( sysRoot_r ).isDir() ) + ZYPP_THROW( Exception(str::form("sysRoot_r argument needs to be a directory. (%s)", sysRoot_r.c_str())) ); + + if ( ZYppFactory::instance().haveZYpp() ) + ZYPP_THROW( Exception("ZYpp instance is already created. (Call this method earlier.)") ); + + if ( flags_r.testFlag( LS_READONLY ) ) + zypp_readonly_hack::IWantIt (); + + sat::Pool satpool( sat::Pool::instance() ); + + if ( 1 ) + { + MIL << "*** load target '" << Repository::systemRepoAlias() << "'\t" << endl; + getZYpp()->initializeTarget( sysRoot_r ); + getZYpp()->target()->load(); + MIL << satpool.systemRepo() << endl; + } + + if ( 1 ) + { + RepoManager repoManager( sysRoot_r ); + RepoInfoList repos = repoManager.knownRepositories(); + for_( it, repos.begin(), repos.end() ) + { + RepoInfo & nrepo( *it ); + + if ( ! nrepo.enabled() ) + continue; + + if ( ! flags_r.testFlag( LS_NOREFRESH ) ) + { + if ( repoManager.isCached( nrepo ) + && ( nrepo.type() == repo::RepoType::RPMPLAINDIR // refreshes always + || repoManager.checkIfToRefreshMetadata( nrepo, nrepo.url() ) == RepoManager::REFRESH_NEEDED ) ) + { + MIL << str::form( "*** clean cache for repo '%s'\t", nrepo.name().c_str() ) << endl; + repoManager.cleanCache( nrepo ); + MIL << str::form( "*** refresh repo '%s'\t", nrepo.name().c_str() ) << endl; + repoManager.refreshMetadata( nrepo ); + } + } + + if ( ! repoManager.isCached( nrepo ) ) + { + MIL << str::form( "*** build cache for repo '%s'\t", nrepo.name().c_str() ) << endl; + repoManager.buildCache( nrepo ); + } + + MIL << str::form( "*** load repo '%s'\t", nrepo.name().c_str() ) << std::flush; + try + { + repoManager.loadFromCache( nrepo ); + MIL << satpool.reposFind( nrepo.alias() ) << endl; + } + catch ( const Exception & exp ) + { + ERR << "*** load repo failed: " << exp.asString() + "\n" + exp.historyAsString() << endl; + ZYPP_RETHROW ( exp ); + } + } + } + MIL << str::form( "*** Read system at '%s'", sysRoot_r.c_str() ) << endl; + } + + ///////////////////////////////////////////////////////////////// + } // namespace misc + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// diff --git a/zypp/misc/DefaultLoadSystem.h b/zypp/misc/DefaultLoadSystem.h new file mode 100644 index 0000000..3b8b1aa --- /dev/null +++ b/zypp/misc/DefaultLoadSystem.h @@ -0,0 +1,63 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/misc/DefaultLoadSystem.h + * +*/ +#ifndef ZYPP_MISC_DEFAULTLOADSYSTEM_H +#define ZYPP_MISC_DEFAULTLOADSYSTEM_H + +#include <iosfwd> + +#include "zypp/Pathname.h" +#include "zypp/base/Flags.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace misc + { ///////////////////////////////////////////////////////////////// + + /** + * Bits for tuning \ref defaultLoadSystem. + * + * Use \ref LoadSystemFlags as a type-safe way of + * storing OR-combinations. + */ + enum LoadSystemFlag + { + LS_READONLY = (1 << 0), //!< // Create readonly ZYpp instance. + LS_NOREFRESH = (1 << 1) //!< // Don't refresh existing repos. + }; + + /** \relates LoadSystemFlag Type-safe way of storing OR-combinations. */ + ZYPP_DECLARE_FLAGS_AND_OPERATORS( LoadSystemFlags, LoadSystemFlag ); + + /** + * Create the ZYpp instance and load target and enabled repositories. + * + * \see LoadSystemFlag for options. + * + * \throws Exception on error + * + * \todo properly handle service refreshs + */ + void defaultLoadSystem( const Pathname & sysRoot_r = "/", LoadSystemFlags flags_r = LoadSystemFlags() ); + + /** \overload */ + inline void defaultLoadSystem( LoadSystemFlags flags_r ) + { defaultLoadSystem( "/", flags_r ); } + + ///////////////////////////////////////////////////////////////// + } // namespace misc + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_MISC_DEFAULTLOADSYSTEM_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] <libzypp> ma-misc : Create misc subdirectory
by Michael Andres 04 Aug '09

04 Aug '09

ref: refs/heads/ma-misc commit d7ecdc1232a8b6381b9266a06053970e6aab1eb7 Author: Michael Andres <ma(a)suse.de> Date: Tue Aug 4 16:18:36 2009 +0200 Create misc subdirectory --- zypp/CMakeLists.txt | 16 +++++- zypp/Misc.cc | 111 ---------------------------------------- zypp/Misc.h | 63 ---------------------- zypp/misc/DefaultLoadSystem.cc | 111 ++++++++++++++++++++++++++++++++++++++++ zypp/misc/DefaultLoadSystem.h | 63 ++++++++++++++++++++++ 5 files changed, 188 insertions(+), 176 deletions(-) diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index 846e3cb..dae0fd9 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -32,7 +32,6 @@ SET( zypp_SRCS Locks.cc MediaProducts.cc MediaSetAccess.cc - Misc.cc NameKindProxy.cc OnMediaLocation.cc Package.cc @@ -120,7 +119,6 @@ SET( zypp_HEADERS ManagedFile.h MediaProducts.h MediaSetAccess.h - Misc.h NameKindProxy.h Vendor.h OnMediaLocation.h @@ -761,8 +759,21 @@ SET( zypp_ws_HEADERS ws/WebpinResult.h ) +#################################################################### + +SET( zypp_misc_HEADERS + Misc.h + misc/DefaultLoadSystem.h +) + +SET( zypp_misc_SRCS + misc/DefaultLoadSystem.cc +) + +#################################################################### SET( zypp_lib_SRCS +${zypp_misc_SRCS} ${zypp_pool_SRCS} ${zypp_parser_susetags_SRCS} ${zypp_parser_xml_SRCS} @@ -820,6 +831,7 @@ ${zypp_source_susetags_HEADERS} ${zypp_target_modalias_HEADERS} ${zypp_target_HEADERS} ${zypp_pool_HEADERS} +${zypp_misc_HEADERS} ) # diff --git a/zypp/Misc.cc b/zypp/Misc.cc deleted file mode 100644 index 8683f6c..0000000 --- a/zypp/Misc.cc +++ /dev/null @@ -1,111 +0,0 @@ -/*---------------------------------------------------------------------\ -| ____ _ __ __ ___ | -| |__ / \ / / . \ . \ | -| / / \ V /| _/ _/ | -| / /__ | | | | | | | -| /_____||_| |_| |_| | -| | -\---------------------------------------------------------------------*/ -/** \file zypp/Misc.cc - * -*/ -#include <iostream> - -#include "zypp/base/LogTools.h" -#include "zypp/PathInfo.h" - -#include "zypp/Misc.h" - -#include "zypp/ZYppFactory.h" -#include "zypp/zypp_detail/ZYppReadOnlyHack.h" -#include "zypp/Target.h" -#include "zypp/RepoManager.h" -#include "zypp/sat/Pool.h" - -using std::endl; - -#undef ZYPP_BASE_LOGGER_LOGGROUP -#define ZYPP_BASE_LOGGER_LOGGROUP "zypp::misc" - -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace misc - { ///////////////////////////////////////////////////////////////// - - void defaultLoadSystem( const Pathname & sysRoot_r, LoadSystemFlags flags_r ) - { - MIL << str::form( "*** Load system at '%s' (%lx)", sysRoot_r.c_str(), (unsigned long)flags_r ) << endl; - - if ( ! PathInfo( sysRoot_r ).isDir() ) - ZYPP_THROW( Exception(str::form("sysRoot_r argument needs to be a directory. (%s)", sysRoot_r.c_str())) ); - - if ( ZYppFactory::instance().haveZYpp() ) - ZYPP_THROW( Exception("ZYpp instance is already created. (Call this method earlier.)") ); - - if ( flags_r.testFlag( LS_READONLY ) ) - zypp_readonly_hack::IWantIt (); - - sat::Pool satpool( sat::Pool::instance() ); - - if ( 1 ) - { - MIL << "*** load target '" << Repository::systemRepoAlias() << "'\t" << endl; - getZYpp()->initializeTarget( sysRoot_r ); - getZYpp()->target()->load(); - MIL << satpool.systemRepo() << endl; - } - - if ( 1 ) - { - RepoManager repoManager( sysRoot_r ); - RepoInfoList repos = repoManager.knownRepositories(); - for_( it, repos.begin(), repos.end() ) - { - RepoInfo & nrepo( *it ); - - if ( ! nrepo.enabled() ) - continue; - - if ( ! flags_r.testFlag( LS_NOREFRESH ) ) - { - if ( repoManager.isCached( nrepo ) - && ( nrepo.type() == repo::RepoType::RPMPLAINDIR // refreshes always - || repoManager.checkIfToRefreshMetadata( nrepo, nrepo.url() ) == RepoManager::REFRESH_NEEDED ) ) - { - MIL << str::form( "*** clean cache for repo '%s'\t", nrepo.name().c_str() ) << endl; - repoManager.cleanCache( nrepo ); - MIL << str::form( "*** refresh repo '%s'\t", nrepo.name().c_str() ) << endl; - repoManager.refreshMetadata( nrepo ); - } - } - - if ( ! repoManager.isCached( nrepo ) ) - { - MIL << str::form( "*** build cache for repo '%s'\t", nrepo.name().c_str() ) << endl; - repoManager.buildCache( nrepo ); - } - - MIL << str::form( "*** load repo '%s'\t", nrepo.name().c_str() ) << std::flush; - try - { - repoManager.loadFromCache( nrepo ); - MIL << satpool.reposFind( nrepo.alias() ) << endl; - } - catch ( const Exception & exp ) - { - ERR << "*** load repo failed: " << exp.asString() + "\n" + exp.historyAsString() << endl; - ZYPP_RETHROW ( exp ); - } - } - } - MIL << str::form( "*** Read system at '%s'", sysRoot_r.c_str() ) << endl; - } - - ///////////////////////////////////////////////////////////////// - } // namespace misc - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// diff --git a/zypp/Misc.h b/zypp/Misc.h deleted file mode 100644 index d8c4c1a..0000000 --- a/zypp/Misc.h +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------\ -| ____ _ __ __ ___ | -| |__ / \ / / . \ . \ | -| / / \ V /| _/ _/ | -| / /__ | | | | | | | -| /_____||_| |_| |_| | -| | -\---------------------------------------------------------------------*/ -/** \file zypp/Misc.h - * -*/ -#ifndef ZYPP_MISC_H -#define ZYPP_MISC_H - -#include <iosfwd> - -#include "zypp/Pathname.h" -#include "zypp/base/Flags.h" - -/////////////////////////////////////////////////////////////////// -namespace zypp -{ ///////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////// - namespace misc - { ///////////////////////////////////////////////////////////////// - - /** - * Bits for tuning \ref defaultLoadSystem. - * - * Use \ref LoadSystemFlags as a type-safe way of - * storing OR-combinations. - */ - enum LoadSystemFlag - { - LS_READONLY = (1 << 0), //!< // Create readonly ZYpp instance. - LS_NOREFRESH = (1 << 1) //!< // Don't refresh existing repos. - }; - - /** \relates LoadSystemFlag Type-safe way of storing OR-combinations. */ - ZYPP_DECLARE_FLAGS_AND_OPERATORS( LoadSystemFlags, LoadSystemFlag ); - - /** - * Create the ZYpp instance and load target and enabled repositories. - * - * \see LoadSystemFlag for options. - * - * \throws Exception on error - * - * \todo properly handle service refreshs - */ - void defaultLoadSystem( const Pathname & sysRoot_r = "/", LoadSystemFlags flags_r = LoadSystemFlags() ); - - /** \overload */ - inline void defaultLoadSystem( LoadSystemFlags flags_r ) - { defaultLoadSystem( "/", flags_r ); } - - ///////////////////////////////////////////////////////////////// - } // namespace misc - /////////////////////////////////////////////////////////////////// - ///////////////////////////////////////////////////////////////// -} // namespace zypp -/////////////////////////////////////////////////////////////////// -#endif // ZYPP_MISC_H diff --git a/zypp/misc/DefaultLoadSystem.cc b/zypp/misc/DefaultLoadSystem.cc new file mode 100644 index 0000000..abb24fb --- /dev/null +++ b/zypp/misc/DefaultLoadSystem.cc @@ -0,0 +1,111 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/misc/DefaultLoadSystem.cc + * +*/ +#include <iostream> + +#include "zypp/base/LogTools.h" +#include "zypp/PathInfo.h" + +#include "zypp/misc/DefaultLoadSystem.h" + +#include "zypp/ZYppFactory.h" +#include "zypp/zypp_detail/ZYppReadOnlyHack.h" +#include "zypp/Target.h" +#include "zypp/RepoManager.h" +#include "zypp/sat/Pool.h" + +using std::endl; + +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "zypp::misc" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace misc + { ///////////////////////////////////////////////////////////////// + + void defaultLoadSystem( const Pathname & sysRoot_r, LoadSystemFlags flags_r ) + { + MIL << str::form( "*** Load system at '%s' (%lx)", sysRoot_r.c_str(), (unsigned long)flags_r ) << endl; + + if ( ! PathInfo( sysRoot_r ).isDir() ) + ZYPP_THROW( Exception(str::form("sysRoot_r argument needs to be a directory. (%s)", sysRoot_r.c_str())) ); + + if ( ZYppFactory::instance().haveZYpp() ) + ZYPP_THROW( Exception("ZYpp instance is already created. (Call this method earlier.)") ); + + if ( flags_r.testFlag( LS_READONLY ) ) + zypp_readonly_hack::IWantIt (); + + sat::Pool satpool( sat::Pool::instance() ); + + if ( 1 ) + { + MIL << "*** load target '" << Repository::systemRepoAlias() << "'\t" << endl; + getZYpp()->initializeTarget( sysRoot_r ); + getZYpp()->target()->load(); + MIL << satpool.systemRepo() << endl; + } + + if ( 1 ) + { + RepoManager repoManager( sysRoot_r ); + RepoInfoList repos = repoManager.knownRepositories(); + for_( it, repos.begin(), repos.end() ) + { + RepoInfo & nrepo( *it ); + + if ( ! nrepo.enabled() ) + continue; + + if ( ! flags_r.testFlag( LS_NOREFRESH ) ) + { + if ( repoManager.isCached( nrepo ) + && ( nrepo.type() == repo::RepoType::RPMPLAINDIR // refreshes always + || repoManager.checkIfToRefreshMetadata( nrepo, nrepo.url() ) == RepoManager::REFRESH_NEEDED ) ) + { + MIL << str::form( "*** clean cache for repo '%s'\t", nrepo.name().c_str() ) << endl; + repoManager.cleanCache( nrepo ); + MIL << str::form( "*** refresh repo '%s'\t", nrepo.name().c_str() ) << endl; + repoManager.refreshMetadata( nrepo ); + } + } + + if ( ! repoManager.isCached( nrepo ) ) + { + MIL << str::form( "*** build cache for repo '%s'\t", nrepo.name().c_str() ) << endl; + repoManager.buildCache( nrepo ); + } + + MIL << str::form( "*** load repo '%s'\t", nrepo.name().c_str() ) << std::flush; + try + { + repoManager.loadFromCache( nrepo ); + MIL << satpool.reposFind( nrepo.alias() ) << endl; + } + catch ( const Exception & exp ) + { + ERR << "*** load repo failed: " << exp.asString() + "\n" + exp.historyAsString() << endl; + ZYPP_RETHROW ( exp ); + } + } + } + MIL << str::form( "*** Read system at '%s'", sysRoot_r.c_str() ) << endl; + } + + ///////////////////////////////////////////////////////////////// + } // namespace misc + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// diff --git a/zypp/misc/DefaultLoadSystem.h b/zypp/misc/DefaultLoadSystem.h new file mode 100644 index 0000000..3b8b1aa --- /dev/null +++ b/zypp/misc/DefaultLoadSystem.h @@ -0,0 +1,63 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp/misc/DefaultLoadSystem.h + * +*/ +#ifndef ZYPP_MISC_DEFAULTLOADSYSTEM_H +#define ZYPP_MISC_DEFAULTLOADSYSTEM_H + +#include <iosfwd> + +#include "zypp/Pathname.h" +#include "zypp/base/Flags.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace misc + { ///////////////////////////////////////////////////////////////// + + /** + * Bits for tuning \ref defaultLoadSystem. + * + * Use \ref LoadSystemFlags as a type-safe way of + * storing OR-combinations. + */ + enum LoadSystemFlag + { + LS_READONLY = (1 << 0), //!< // Create readonly ZYpp instance. + LS_NOREFRESH = (1 << 1) //!< // Don't refresh existing repos. + }; + + /** \relates LoadSystemFlag Type-safe way of storing OR-combinations. */ + ZYPP_DECLARE_FLAGS_AND_OPERATORS( LoadSystemFlags, LoadSystemFlag ); + + /** + * Create the ZYpp instance and load target and enabled repositories. + * + * \see LoadSystemFlag for options. + * + * \throws Exception on error + * + * \todo properly handle service refreshs + */ + void defaultLoadSystem( const Pathname & sysRoot_r = "/", LoadSystemFlags flags_r = LoadSystemFlags() ); + + /** \overload */ + inline void defaultLoadSystem( LoadSystemFlags flags_r ) + { defaultLoadSystem( "/", flags_r ); } + + ///////////////////////////////////////////////////////////////// + } // namespace misc + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp +/////////////////////////////////////////////////////////////////// +#endif // ZYPP_MISC_DEFAULTLOADSYSTEM_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] <libzypp-testsuite> master : Parse and process <upgradeRepo name=REPOALIAS/>
by Michael Andres 04 Aug '09

04 Aug '09

ref: refs/heads/master commit 623671dc81d2e39b210733667b3ca446161b6dc6 Author: Michael Andres <ma(a)suse.de> Date: Tue Aug 4 15:22:45 2009 +0200 Parse and process <upgradeRepo name=REPOALIAS/> --- VERSION | 2 +- package/libzypp-testsuite-tools.changes | 6 ++++++ solver/src/deptestomatic.cc | 25 +++++++++++++++++++++---- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 56d9bb1..985ee41 100644 --- a/VERSION +++ b/VERSION @@ -49,5 +49,5 @@ dnl ================================================== m4_define([LIBZYPPTESTSUITE_MINOR], [2]) m4_define([LIBZYPPTESTSUITE_COMPATMINOR], [2]) dnl ================================================== -m4_define([LIBZYPPTESTSUITE_PATCH], [9]) +m4_define([LIBZYPPTESTSUITE_PATCH], [10]) dnl ================================================== diff --git a/package/libzypp-testsuite-tools.changes b/package/libzypp-testsuite-tools.changes index 9d56bad..7da7be0 100644 --- a/package/libzypp-testsuite-tools.changes +++ b/package/libzypp-testsuite-tools.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 4 15:16:26 CEST 2009 - ma(a)suse.de + +- Parse and process <upgradeRepo name=REPOALIAS/> +- version 4.2.10 + +------------------------------------------------------------------- Wed Jul 8 14:16:33 CEST 2009 - ma(a)suse.de - Remove references to deprecated UpgradeStatistics. diff --git a/solver/src/deptestomatic.cc b/solver/src/deptestomatic.cc index 1b6e545..da3535b 100644 --- a/solver/src/deptestomatic.cc +++ b/solver/src/deptestomatic.cc @@ -203,7 +203,7 @@ List of known tags. See http://en.opensuse.org/Libzypp/Testsuite_solver for deta addRequire arch availablelocales channel createTestcase current distupgrade force-install forceResolve \n\ graphic hardwareInfo ignorealreadyrecommended install instorder keep locale lock mediaid mediaorder \n\ onlyRequires reportproblems setlicencebit showpool showselectable source subscribe system systemCheck \n\ - takesolution uninstall update validate verify whatprovides" << endl; + takesolution uninstall update upgradeRepo validate verify whatprovides" << endl; return str; @@ -668,7 +668,7 @@ load_source (const string & alias, const string & filename, const string & type, nrepo.addBaseUrl ( pathname.asUrl() ); satRepo.setInfo (nrepo); - satRepo.addHelix( filename ); + satRepo.addHelix( pathname ); cout << "Loaded " << satRepo.solvablesSize() << " resolvables from " << (filename.empty()?pathname.asString():filename) << "." << endl; } catch ( Exception & excpt_r ) { @@ -850,6 +850,8 @@ parse_xml_trial (XmlNode_Ptr node, ResPool & pool) exit (0); } + sat::Pool satpool( sat::Pool::instance() ); + zypp::solver::detail::Resolver_Ptr resolver = new zypp::solver::detail::Resolver( pool ); resolver->setForceResolve( forceResolve ); resolver->setIgnoreAlreadyRecommended( ignorealreadyrecommended ); @@ -984,15 +986,29 @@ parse_xml_trial (XmlNode_Ptr node, ResPool & pool) } else if (node->equals ("addConflict")) { vector<string> names; str::split( node->getProp ("name"), back_inserter(names), "," ); - for (unsigned i=0; i < names.size(); i++) { + for (unsigned i=0; i < names.size(); ++i) { resolver->addExtraConflict(Capability (names[i], string2kind (node->getProp ("kind")))); } } else if (node->equals ("addRequire")) { vector<string> names; str::split( node->getProp ("name"), back_inserter(names), "," ); - for (unsigned i=0; i < names.size(); i++) { + for (unsigned i=0; i < names.size(); ++i) { resolver->addExtraRequire(Capability (names[i], string2kind (node->getProp ("kind")))); } + } else if (node->equals ("upgradeRepo")) { + vector<string> names; + str::split( node->getProp ("name"), back_inserter(names), "," ); + for (unsigned i=0; i < names.size(); ++i) { + Repository r = satpool.reposFind( names[i] ); + if ( ! r ) + { + ERR << "upgradeRepo '" << r << "' not found." << endl; + cerr << "upgradeRepo '" << r << "' not found." << endl; + exit( 1 ); + } + else + resolver->addUpgradeRepo( r ); + } } else if (node->equals ("reportproblems")) { bool success; if (!solverQueue.empty()) @@ -1350,6 +1366,7 @@ parse_xml_trial (XmlNode_Ptr node, ResPool & pool) testcase.createTestcase (*resolver); } else { + ERR << "Unknown tag '" << node->name() << "' in trial" << endl; cerr << "Unknown tag '" << node->name() << "' in trial" << 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] <libzypp-testsuite> master : No need to link libsatsolver.a
by Michael Andres 04 Aug '09

04 Aug '09

ref: refs/heads/master commit b776de5729e030c7eef28a23236c8a4eae4ac7cc Author: Michael Andres <ma(a)suse.de> Date: Tue Aug 4 15:22:33 2009 +0200 No need to link libsatsolver.a --- solver/src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/solver/src/Makefile.am b/solver/src/Makefile.am index df0167f..3dce3b8 100644 --- a/solver/src/Makefile.am +++ b/solver/src/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = -I/usr/include/libxml2 \ -DZYPP_BASE_LOGGER_LOGGROUP=\"testsuite\" -LDADD = $(libdir)/libzypp.so $(libdir)/libsatsolver.a -lexpat -lQtCore -lQtGui -lQt3Support -lqdialogsolver -lyui +LDADD = -lzypp -lexpat -lQtCore -lQtGui -lQt3Support -lqdialogsolver -lyui # We're not ready for this yet. #check_PROGRAMS = deptestomatic.multi -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : changes 6.13.0
by Michael Andres 03 Aug '09

03 Aug '09

ref: refs/heads/master commit c005a4f1a38c9999654a82cbd071748ead43b585 Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 3 18:47:58 2009 +0200 changes 6.13.0 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 04bf8a1..fb65779 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") -SET(LIBZYPP_MINOR "12") +SET(LIBZYPP_MINOR "13") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.12.0 (11) +# LAST RELEASED: 6.13.0 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index f2bd12f..f784f67 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 3 18:46:13 CEST 2009 - ma(a)suse.de + +- New Resolver::addUpgradeRepo to perform a dist upgrade restricted to + certain repositories. +- version 6.13.0 (11) + +------------------------------------------------------------------- Fri Jul 31 17:55:33 CEST 2009 - ma(a)suse.de - Remove confusing newlines in vendor change info (bnc #503859) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : changes 6.13.0
by Michael Andres 03 Aug '09

03 Aug '09

ref: refs/heads/ma-misc commit c005a4f1a38c9999654a82cbd071748ead43b585 Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 3 18:47:58 2009 +0200 changes 6.13.0 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 04bf8a1..fb65779 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") -SET(LIBZYPP_MINOR "12") +SET(LIBZYPP_MINOR "13") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.12.0 (11) +# LAST RELEASED: 6.13.0 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index f2bd12f..f784f67 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 3 18:46:13 CEST 2009 - ma(a)suse.de + +- New Resolver::addUpgradeRepo to perform a dist upgrade restricted to + certain repositories. +- version 6.13.0 (11) + +------------------------------------------------------------------- Fri Jul 31 17:55:33 CEST 2009 - ma(a)suse.de - Remove confusing newlines in vendor change info (bnc #503859) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : New Resolver::addUpgradeRepo to perform a dist upgrade restricted to certain repositories.
by Michael Andres 03 Aug '09

03 Aug '09

ref: refs/heads/master commit ad99202b37204a43c6163fa6e9cfc0ddf96ab7a7 Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 3 18:45:39 2009 +0200 New Resolver::addUpgradeRepo to perform a dist upgrade restricted to certain repositories. --- zypp/Resolver.cc | 3 +++ zypp/Resolver.h | 20 +++++++++++++++++++- zypp/solver/detail/Resolver.cc | 2 +- zypp/solver/detail/Resolver.h | 6 ++++++ zypp/solver/detail/SATResolver.cc | 10 +++++++++- zypp/solver/detail/SATResolver.h | 3 ++- zypp/solver/detail/Testcase.cc | 9 +++++++++ zypp/solver/detail/Testcase.h | 1 + 8 files changed, 50 insertions(+), 4 deletions(-) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index d974694..6e3b9cf 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -98,6 +98,9 @@ namespace zypp void Resolver::setDefaultSolveSrcPackages() { _pimpl->setSolveSrcPackages( indeterminate ); } bool Resolver::solveSrcPackages() const { return _pimpl->solveSrcPackages(); } + void Resolver::addUpgradeRepo( Repository repo_r ) { _pimpl->addUpgradeRepo( repo_r ); } + void Resolver::removeUpgradeRepo( Repository repo_r ) { _pimpl->removeUpgradeRepo( repo_r ); } + void Resolver::removeUpgradeRepos() { _pimpl->removeUpgradeRepos(); } void Resolver::addRequire( const Capability & capability ) { _pimpl->addExtraRequire( capability ); } void Resolver::addConflict( const Capability & capability ) { _pimpl->addExtraConflict( capability ); } diff --git a/zypp/Resolver.h b/zypp/Resolver.h index d00e5a9..b6b748b 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -115,6 +115,8 @@ namespace zypp * all packages with a special resolver algorithm which takes * care of package splits, pattern and product updates, * etc. + * + * \see \ref addUpgradeRepo **/ bool doUpgrade(); @@ -129,7 +131,6 @@ namespace zypp **/ void doUpdate( ); - /** * Unmaintained packages which does not fit to * the updated system (broken dependencies) will be @@ -218,6 +219,23 @@ namespace zypp bool solveSrcPackages() const; /** + * Adding request to perform a dist upgrade restricted to this repository. + * This is what e.g. <tt>zypper dup --repo myrepo</tt> should perform. + * \see \ref doUpgrade + */ + void addUpgradeRepo( Repository repo_r ); + + /** + * Remove the upgrade request for this repo. + */ + void removeUpgradeRepo( Repository repo_r ); + + /** + * Remove all upgrade repo requests. + */ + void removeUpgradeRepos(); + + /** * Adding additional requirement * */ diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc index 90a6388..2e38463 100644 --- a/zypp/solver/detail/Resolver.cc +++ b/zypp/solver/detail/Resolver.cc @@ -294,7 +294,7 @@ void Resolver::solverInit() bool Resolver::resolvePool() { solverInit(); - return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak); + return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak, _upgradeRepos ); } bool Resolver::resolveQueue( solver::detail::SolverQueueItemList & queue ) diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h index bbc8395..8f65722 100644 --- a/zypp/solver/detail/Resolver.h +++ b/zypp/solver/detail/Resolver.h @@ -95,6 +95,7 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { CapabilitySet _extra_requires; CapabilitySet _extra_conflicts; + std::set<Repository> _upgradeRepos; // Regard dependencies of the item weak onl PoolItemList _addWeak; @@ -153,6 +154,11 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { ResPool pool() const; void setPool( const ResPool & pool ) { _pool = pool; } + void addUpgradeRepo( Repository repo_r ) { if ( repo_r ) _upgradeRepos.insert( repo_r ); } + void removeUpgradeRepo( Repository repo_r ) { _upgradeRepos.erase( repo_r ); } + void removeUpgradeRepos() { _upgradeRepos.clear(); } + const std::set<Repository> & upgradeRepos() const { return _upgradeRepos; } + void addExtraRequire( const Capability & capability ); void removeExtraRequire( const Capability & capability ); void addExtraConflict( const Capability & capability ); diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index e336d22..e492530 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -656,7 +656,8 @@ SATResolver::solverEnd() bool SATResolver::resolvePool(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps, - const PoolItemList & weakItems) + const PoolItemList & weakItems, + const std::set<Repository> & upgradeRepos) { MIL << "SATResolver::resolvePool()" << endl; @@ -685,6 +686,13 @@ SATResolver::resolvePool(const CapabilitySet & requires_caps, } } + for_( iter, upgradeRepos.begin(), upgradeRepos.end() ) + { + queue_push( &(_jobQueue), SOLVER_DISTUPGRADE ); + queue_push( &(_jobQueue), iter->get()->repoid ); + MIL << "Upgrade repo " << *iter << endl; + } + for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE_PROVIDES ); queue_push( &(_jobQueue), iter->id() ); diff --git a/zypp/solver/detail/SATResolver.h b/zypp/solver/detail/SATResolver.h index 750731d..5ac68b3 100644 --- a/zypp/solver/detail/SATResolver.h +++ b/zypp/solver/detail/SATResolver.h @@ -140,7 +140,8 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable { // solver run with pool selected items bool resolvePool(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps, - const PoolItemList & weakItems + const PoolItemList & weakItems, + const std::set<Repository> & upgradeRepos ); // solver run with the given request queue bool resolveQueue(const SolverQueueItemList &requestQueue, diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc index 41299dc..0ce55fe 100644 --- a/zypp/solver/detail/Testcase.cc +++ b/zypp/solver/detail/Testcase.cc @@ -373,6 +373,7 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver control.addDependencies (resolver.extraRequires(), resolver.extraConflicts()); control.addDependencies (SystemCheck::instance().requiredSystemCap(), SystemCheck::instance().conflictSystemCap()); + control.addUpgradeRepos( resolver.upgradeRepos() ); if (resolver.isUpgradeMode()) control.distupgrade (); @@ -532,6 +533,14 @@ void HelixControl::addDependencies (const CapabilitySet & capRequire, const Capa } } +void HelixControl::addUpgradeRepos( const std::set<Repository> & upgradeRepos_r ) +{ + for_( it, upgradeRepos_r.begin(), upgradeRepos_r.end() ) + { + *file << "<upgradeRepo name=\"" << it->alias() << "\"/>" << endl; + } +} + void HelixControl::distupgrade() { *file << "<distupgrade/>" << endl; diff --git a/zypp/solver/detail/Testcase.h b/zypp/solver/detail/Testcase.h index dc012c0..d7854b8 100644 --- a/zypp/solver/detail/Testcase.h +++ b/zypp/solver/detail/Testcase.h @@ -116,6 +116,7 @@ class HelixControl { void deleteResolvable (const ResObject::constPtr &resObject, const ResStatus &status); void addDependencies (const CapabilitySet &capRequire, const CapabilitySet &capConflict); + void addUpgradeRepos( const std::set<Repository> & upgradeRepos_r ); void distupgrade (); void verifySystem (); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : New Resolver::addUpgradeRepo to perform a dist upgrade restricted to certain repositories.
by Michael Andres 03 Aug '09

03 Aug '09

ref: refs/heads/ma-misc commit ad99202b37204a43c6163fa6e9cfc0ddf96ab7a7 Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 3 18:45:39 2009 +0200 New Resolver::addUpgradeRepo to perform a dist upgrade restricted to certain repositories. --- zypp/Resolver.cc | 3 +++ zypp/Resolver.h | 20 +++++++++++++++++++- zypp/solver/detail/Resolver.cc | 2 +- zypp/solver/detail/Resolver.h | 6 ++++++ zypp/solver/detail/SATResolver.cc | 10 +++++++++- zypp/solver/detail/SATResolver.h | 3 ++- zypp/solver/detail/Testcase.cc | 9 +++++++++ zypp/solver/detail/Testcase.h | 1 + 8 files changed, 50 insertions(+), 4 deletions(-) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index d974694..6e3b9cf 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -98,6 +98,9 @@ namespace zypp void Resolver::setDefaultSolveSrcPackages() { _pimpl->setSolveSrcPackages( indeterminate ); } bool Resolver::solveSrcPackages() const { return _pimpl->solveSrcPackages(); } + void Resolver::addUpgradeRepo( Repository repo_r ) { _pimpl->addUpgradeRepo( repo_r ); } + void Resolver::removeUpgradeRepo( Repository repo_r ) { _pimpl->removeUpgradeRepo( repo_r ); } + void Resolver::removeUpgradeRepos() { _pimpl->removeUpgradeRepos(); } void Resolver::addRequire( const Capability & capability ) { _pimpl->addExtraRequire( capability ); } void Resolver::addConflict( const Capability & capability ) { _pimpl->addExtraConflict( capability ); } diff --git a/zypp/Resolver.h b/zypp/Resolver.h index d00e5a9..b6b748b 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -115,6 +115,8 @@ namespace zypp * all packages with a special resolver algorithm which takes * care of package splits, pattern and product updates, * etc. + * + * \see \ref addUpgradeRepo **/ bool doUpgrade(); @@ -129,7 +131,6 @@ namespace zypp **/ void doUpdate( ); - /** * Unmaintained packages which does not fit to * the updated system (broken dependencies) will be @@ -218,6 +219,23 @@ namespace zypp bool solveSrcPackages() const; /** + * Adding request to perform a dist upgrade restricted to this repository. + * This is what e.g. <tt>zypper dup --repo myrepo</tt> should perform. + * \see \ref doUpgrade + */ + void addUpgradeRepo( Repository repo_r ); + + /** + * Remove the upgrade request for this repo. + */ + void removeUpgradeRepo( Repository repo_r ); + + /** + * Remove all upgrade repo requests. + */ + void removeUpgradeRepos(); + + /** * Adding additional requirement * */ diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc index 90a6388..2e38463 100644 --- a/zypp/solver/detail/Resolver.cc +++ b/zypp/solver/detail/Resolver.cc @@ -294,7 +294,7 @@ void Resolver::solverInit() bool Resolver::resolvePool() { solverInit(); - return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak); + return _satResolver->resolvePool(_extra_requires, _extra_conflicts, _addWeak, _upgradeRepos ); } bool Resolver::resolveQueue( solver::detail::SolverQueueItemList & queue ) diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h index bbc8395..8f65722 100644 --- a/zypp/solver/detail/Resolver.h +++ b/zypp/solver/detail/Resolver.h @@ -95,6 +95,7 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { CapabilitySet _extra_requires; CapabilitySet _extra_conflicts; + std::set<Repository> _upgradeRepos; // Regard dependencies of the item weak onl PoolItemList _addWeak; @@ -153,6 +154,11 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { ResPool pool() const; void setPool( const ResPool & pool ) { _pool = pool; } + void addUpgradeRepo( Repository repo_r ) { if ( repo_r ) _upgradeRepos.insert( repo_r ); } + void removeUpgradeRepo( Repository repo_r ) { _upgradeRepos.erase( repo_r ); } + void removeUpgradeRepos() { _upgradeRepos.clear(); } + const std::set<Repository> & upgradeRepos() const { return _upgradeRepos; } + void addExtraRequire( const Capability & capability ); void removeExtraRequire( const Capability & capability ); void addExtraConflict( const Capability & capability ); diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index e336d22..e492530 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -656,7 +656,8 @@ SATResolver::solverEnd() bool SATResolver::resolvePool(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps, - const PoolItemList & weakItems) + const PoolItemList & weakItems, + const std::set<Repository> & upgradeRepos) { MIL << "SATResolver::resolvePool()" << endl; @@ -685,6 +686,13 @@ SATResolver::resolvePool(const CapabilitySet & requires_caps, } } + for_( iter, upgradeRepos.begin(), upgradeRepos.end() ) + { + queue_push( &(_jobQueue), SOLVER_DISTUPGRADE ); + queue_push( &(_jobQueue), iter->get()->repoid ); + MIL << "Upgrade repo " << *iter << endl; + } + for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { queue_push( &(_jobQueue), SOLVER_INSTALL_SOLVABLE_PROVIDES ); queue_push( &(_jobQueue), iter->id() ); diff --git a/zypp/solver/detail/SATResolver.h b/zypp/solver/detail/SATResolver.h index 750731d..5ac68b3 100644 --- a/zypp/solver/detail/SATResolver.h +++ b/zypp/solver/detail/SATResolver.h @@ -140,7 +140,8 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable { // solver run with pool selected items bool resolvePool(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps, - const PoolItemList & weakItems + const PoolItemList & weakItems, + const std::set<Repository> & upgradeRepos ); // solver run with the given request queue bool resolveQueue(const SolverQueueItemList &requestQueue, diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc index 41299dc..0ce55fe 100644 --- a/zypp/solver/detail/Testcase.cc +++ b/zypp/solver/detail/Testcase.cc @@ -373,6 +373,7 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver control.addDependencies (resolver.extraRequires(), resolver.extraConflicts()); control.addDependencies (SystemCheck::instance().requiredSystemCap(), SystemCheck::instance().conflictSystemCap()); + control.addUpgradeRepos( resolver.upgradeRepos() ); if (resolver.isUpgradeMode()) control.distupgrade (); @@ -532,6 +533,14 @@ void HelixControl::addDependencies (const CapabilitySet & capRequire, const Capa } } +void HelixControl::addUpgradeRepos( const std::set<Repository> & upgradeRepos_r ) +{ + for_( it, upgradeRepos_r.begin(), upgradeRepos_r.end() ) + { + *file << "<upgradeRepo name=\"" << it->alias() << "\"/>" << endl; + } +} + void HelixControl::distupgrade() { *file << "<distupgrade/>" << endl; diff --git a/zypp/solver/detail/Testcase.h b/zypp/solver/detail/Testcase.h index dc012c0..d7854b8 100644 --- a/zypp/solver/detail/Testcase.h +++ b/zypp/solver/detail/Testcase.h @@ -116,6 +116,7 @@ class HelixControl { void deleteResolvable (const ResObject::constPtr &resObject, const ResStatus &status); void addDependencies (const CapabilitySet &capRequire, const CapabilitySet &capConflict); + void addUpgradeRepos( const std::set<Repository> & upgradeRepos_r ); void distupgrade (); void verifySystem (); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp-bindings> master : Adappt to boost-1.39
by Michael Andres 03 Aug '09

03 Aug '09

ref: refs/heads/master commit 570b225a7efbbdda476fa0d1b77b8f0d267dd4cb Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 3 16:53:08 2009 +0200 Adappt to boost-1.39 --- CMakeLists.txt | 10 ++++++++++ VERSION.cmake | 2 +- package/libzypp-bindings.changes | 6 ++++++ swig/perl5/CMakeLists.txt | 2 +- swig/python/CMakeLists.txt | 2 +- swig/ruby/CMakeLists.txt | 2 +- swig/zypp.i | 7 +++++++ 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 488537a..082b255 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,16 @@ FIND_PACKAGE(SWIG REQUIRED) FIND_PACKAGE(Zypp REQUIRED) +SET( SWIG_DEFINITIONS -DZYPP_DEPRECATED ) + +FIND_PATH( BOOST_SMARTPTR_INCLUDE_DIR boost/smart_ptr/shared_ptr.hpp + /usr/include + /usr/local/include +) +IF( BOOST_SMARTPTR_INCLUDE_DIR ) + SET( SWIG_DEFINITIONS ${SWIG_DEFINITIONS} -DBOOST_SMARTPTR_INCLUDE_DIR ) +ENDIF( BOOST_SMARTPTR_INCLUDE_DIR ) + # Now into SWIG ADD_SUBDIRECTORY(swig) diff --git a/VERSION.cmake b/VERSION.cmake index 4692e34..446415e 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "5") -SET(VERSION_PATCH "0") +SET(VERSION_PATCH "1") diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 9c911e0..866bbf6 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 3 16:47:24 CEST 2009 - ma(a)suse.de + +- Adappt to boost-1.39 +- version 0.5.1 + +------------------------------------------------------------------- Tue Jul 14 14:57:44 CEST 2009 - ma(a)suse.de - Fix specfile data. diff --git a/swig/perl5/CMakeLists.txt b/swig/perl5/CMakeLists.txt index c0c5b3e..80c4420 100644 --- a/swig/perl5/CMakeLists.txt +++ b/swig/perl5/CMakeLists.txt @@ -32,7 +32,7 @@ endif(COMMAND cmake_policy) ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..." - COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -perl5 -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} ${SWIG_DEFINITIONS} -c++ -perl5 -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt index dc30317..864c0cb 100644 --- a/swig/python/CMakeLists.txt +++ b/swig/python/CMakeLists.txt @@ -24,7 +24,7 @@ MESSAGE(STATUS "Python include path: ${PYTHON_INCLUDE_PATH}") ADD_CUSTOM_COMMAND ( OUTPUT ${SWIG_OUTPUT} COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for python..." - COMMAND ${SWIG_EXECUTABLE} -v -DZYPP_DEPRECATED -c++ -python -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} -v ${SWIG_DEFINITIONS} -c++ -python -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i diff --git a/swig/ruby/CMakeLists.txt b/swig/ruby/CMakeLists.txt index c683a27..41c7efd 100644 --- a/swig/ruby/CMakeLists.txt +++ b/swig/ruby/CMakeLists.txt @@ -16,7 +16,7 @@ MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}") ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for Ruby..." - COMMAND ${SWIG_EXECUTABLE} -DZYPP_DEPRECATED -c++ -ruby -autorename -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} + COMMAND ${SWIG_EXECUTABLE} ${SWIG_DEFINITIONS} -c++ -ruby -autorename -o ${SWIG_OUTPUT} -I${ZYPP_INCLUDE_DIR} ${SWIG_INPUT} COMMAND ${CMAKE_COMMAND} -E echo "Done." WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i diff --git a/swig/zypp.i b/swig/zypp.i index cabcde8..67c17ae 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -88,10 +88,17 @@ namespace zypp { %include "perl5/perl.i" #endif +#ifdef BOOST_SMARTPTR_INCLUDE_DIR +%import <boost/smart_ptr/scoped_ptr.hpp> +%import <boost/smart_ptr/shared_ptr.hpp> +%import <boost/smart_ptr/weak_ptr.hpp> +%import <boost/smart_ptr/intrusive_ptr.hpp> +#else %import <boost/scoped_ptr.hpp> %import <boost/shared_ptr.hpp> %import <boost/weak_ptr.hpp> %import <boost/intrusive_ptr.hpp> +#endif %import <zypp/base/PtrTypes.h> %import <zypp/base/Flags.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] <libzypp> master : Use IdStrings for vendor equivalence detection.
by Michael Andres 03 Aug '09

03 Aug '09

ref: refs/heads/master commit 728253d2aa930e19a8637b1e94e09c96a6c38128 Author: Michael Andres <ma(a)suse.de> Date: Mon Aug 3 13:53:35 2009 +0200 Use IdStrings for vendor equivalence detection. --- zypp/VendorAttr.cc | 121 +++++++++++++++++++++++------------- zypp/VendorAttr.h | 12 ++++- zypp/solver/detail/Helper.cc | 2 +- zypp/solver/detail/SATResolver.cc | 8 +- zypp/ui/SelectableImpl.h | 2 +- 5 files changed, 94 insertions(+), 51 deletions(-) diff --git a/zypp/VendorAttr.cc b/zypp/VendorAttr.cc index 5481a96..d111b41 100644 --- a/zypp/VendorAttr.cc +++ b/zypp/VendorAttr.cc @@ -48,15 +48,73 @@ namespace zypp { ///////////////////////////////////////////////////////////////// typedef map<Vendor,unsigned int> VendorMap; - VendorMap _vendorMap; - VendorMap _matchMap; unsigned int vendorGroupCounter; ///////////////////////////////////////////////////////////////// } // namespace /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace + { ///////////////////////////////////////////////////////////////// + typedef DefaultIntegral<int,0> VendorMatchEntry; + typedef std::tr1::unordered_map<IdString, VendorMatchEntry> VendorMatch; + int _nextId = -1; + VendorMatch _vendorMatch; + + /** Reset match cache if global VendorMap was changed. */ + inline void vendorMatchIdReset() + { + _nextId = -1; + _vendorMatch.clear(); + } + + /** + * Helper mapping vendor string to eqivalence class ID. + * + * \li Return the vendor strings eqivalence class ID stored in _vendorMatch. + * \li If not found, assign and return the eqivalence class ID of the lowercased string. + * \li If not found, assign and return a new ID (look into the predefined VendorMap (id>0), + * otherwise create a new ID (<0)). + */ + inline unsigned vendorMatchId( IdString vendor ) + { + VendorMatchEntry & ent( _vendorMatch[vendor] ); + if ( ! ent ) + { + IdString lcvendor( str::toLower( vendor.asString() ) ); + VendorMatchEntry & lcent( _vendorMatch[lcvendor] ); + if ( ! lcent ) + { + unsigned myid = 0; + // Compare this entry with the global vendor map. + // Reversed to get the longes prefix. + for ( VendorMap::reverse_iterator it = _vendorMap.rbegin(); it != _vendorMap.rend(); ++it ) + { + if ( str::hasPrefix( lcvendor.c_str(), it->first ) ) + { + myid = it->second; + break; // found + } + } + if ( ! myid ) + { + myid = --_nextId; // get a new class ID + } + ent = lcent = myid; // remember the new DI + } + else + { + ent = lcent; // take the ID from the lowercased vendor string + } + } + return ent; + } + ///////////////////////////////////////////////////////////////// + } // namespace + /////////////////////////////////////////////////////////////////// + const VendorAttr & VendorAttr::instance() { static VendorAttr _val; @@ -154,6 +212,9 @@ namespace zypp if (nextId == vendorGroupCounter + 1) ++vendorGroupCounter; + + // invalidate any match cache + vendorMatchIdReset(); } bool VendorAttr::addVendorFile( const Pathname & filename ) const @@ -226,57 +287,29 @@ namespace zypp return true; } + ////////////////////////////////////////////////////////////////// + // vendor equivalence: + ////////////////////////////////////////////////////////////////// + bool VendorAttr::equivalent( IdString lVendor, IdString rVendor ) const { if ( lVendor == rVendor ) return true; - return equivalent( lVendor.asString(), rVendor.asString() ); + return vendorMatchId( lVendor ) == vendorMatchId( rVendor ); } bool VendorAttr::equivalent( const Vendor & lVendor, const Vendor & rVendor ) const - { - unsigned int lhsID = 0; - unsigned int rhsID = 0; - Vendor lhs = str::toLower (lVendor); - Vendor rhs = str::toLower (rVendor); - - if ( lhs == rhs ) - return true; - - // NOTE: iterate reverse to get find longest prefix first! - - if (_matchMap.find(lhs) != _matchMap.end()) { - lhsID = _matchMap[lhs]; - } else { - // compare this entry with the vendor map - for (VendorMap::reverse_iterator it = _vendorMap.rbegin(); - it != _vendorMap.rend(); - ++it) { - if (lhs.substr (0, it->first.size()) == it->first) { - lhsID = it->second; - _matchMap[lhs] = lhsID; - break; // exit for - } - } - } - - if (_matchMap.find(rhs) != _matchMap.end()) { - rhsID = _matchMap[rhs]; - } else { - // compare this entry with the vendor map - for (VendorMap::reverse_iterator it = _vendorMap.rbegin(); - it != _vendorMap.rend(); - ++it) { - if (rhs.substr (0, it->first.size()) == it->first) { - rhsID = it->second; - _matchMap[rhs] = rhsID; - break; // exit for - } - } - } - return( lhsID && rhsID && lhsID == rhsID ); + { return equivalent( IdString( lVendor ), IdString( rVendor ) ); } + bool VendorAttr::equivalent( sat::Solvable lVendor, sat::Solvable rVendor ) const + { return equivalent( lVendor.vendor(), rVendor.vendor() ); } + + bool VendorAttr::equivalent( const PoolItem & lVendor, const PoolItem & rVendor ) const + { return equivalent( lVendor.satSolvable().vendor(), rVendor.satSolvable().vendor() ); } + + ////////////////////////////////////////////////////////////////// + std::ostream & operator<<( std::ostream & str, const VendorAttr & /*obj*/ ) { str << "Equivalent vendors:"; diff --git a/zypp/VendorAttr.h b/zypp/VendorAttr.h index 7ddda98..22ef3b5 100644 --- a/zypp/VendorAttr.h +++ b/zypp/VendorAttr.h @@ -23,6 +23,12 @@ namespace zypp { ////////////////////////////////////////////////////////////////// + class PoolItem; + namespace sat + { + class Solvable; + } + /** Definition of vendor equivalence. * * Packages with equivalment vendor strings may replace themself without @@ -63,8 +69,12 @@ class VendorAttr * different vendor usually must be confirmed by the user. */ bool equivalent( const Vendor & lVendor, const Vendor & rVendor ) const; - /** \overload using IdStrings */ + /** \overload using \ref IdStrings */ bool equivalent( IdString lVendor, IdString rVendor ) const; + /** \overload using \ref sat::Solvable */ + bool equivalent( sat::Solvable lVendor, sat::Solvable rVendor ) const; + /** \overload using \ref PoolItem */ + bool equivalent( const PoolItem & lVendor, const PoolItem & rVendor ) const; private: VendorAttr(); diff --git a/zypp/solver/detail/Helper.cc b/zypp/solver/detail/Helper.cc index 45130c4..37a20da 100644 --- a/zypp/solver/detail/Helper.cc +++ b/zypp/solver/detail/Helper.cc @@ -132,7 +132,7 @@ class LookForUpdate : public resfilter::PoolItemFilterFunctor if ( installed.resolvable() ) { - if ( !VendorAttr::instance().equivalent(installed->vendor(),provider->vendor()) ) + if ( !VendorAttr::instance().equivalent( installed, provider ) ) { MIL << "Discarding '" << provider << "' from vendor '" << provider->vendor() << "' different to uninstalled '" diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index 1e67c6a..e336d22 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -69,10 +69,10 @@ IMPL_PTR_TYPE(SATResolver); // Callbacks for SAT policies //--------------------------------------------------------------------------- -int vendorCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2) { -// DBG << "vendorCheck: " << IdString(solvable1->vendor) << " <--> " << IdString(solvable2->vendor) << endl; - return VendorAttr::instance().equivalent( IdString(solvable1->vendor).asString(), - IdString(solvable2->vendor).asString() ) ? 0 : 1; +int vendorCheck( Pool *pool, Solvable *solvable1, Solvable *solvable2 ) +{ + return VendorAttr::instance().equivalent( IdString(solvable1->vendor), + IdString(solvable2->vendor) ) ? 0 : 1; } diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 008333b..8b71ae7 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -225,7 +225,7 @@ namespace zypp { if ( ! solver_allowVendorChange ) { - if ( VendorAttr::instance().equivalent( (*iit).satSolvable().vendor(), (*it).satSolvable().vendor() ) ) + if ( VendorAttr::instance().equivalent( (*iit), (*it) ) ) return *it; else if ( ! sameArch ) // remember best same arch in case no same vendor found sameArch = *it; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0