[zypp-commit] r11056 - in /trunk/libzypp: VERSION.cmake cmake/modules/FindGettext.cmake package/libzypp.changes zypp/RepoManager.cc

Author: mlandres Date: Fri Sep 12 18:25:41 2008 New Revision: 11056 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11056&view=rev Log: Create new Service repos in disbaled sate. Removed: trunk/libzypp/cmake/modules/FindGettext.cmake Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/RepoManager.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11056&r1=11055&r2=11056&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Fri Sep 12 18:25:41 2008 @@ -63,6 +63,6 @@ SET(LIBZYPP_MINOR "10") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.9.0 (8) +# LAST RELEASED: 5.10.0 (10) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=11056&r1=11055&r2=11056&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Fri Sep 12 18:25:41 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Sep 12 18:24:28 CEST 2008 - ma@suse.de + +- Create new Service repos in disbaled sate. +- revision 11056 +- version 5.10.0 (10) + +------------------------------------------------------------------- Fri Sep 12 16:04:54 CEST 2008 - ma@suse.de - Make registerTarget and registerRelease abvailable for installed @@ -10,7 +17,7 @@ - Add url lists query to Product interface. A generic query and convenience methods to query urls for "releasenotes", "register", - "updateurls", "extraurls", "optionalurls" and "smolt" + "updateurls", "extraurls", "optionalurls" and "smolt" (bnc #413444) - revision 11029 ------------------------------------------------------------------- Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=11056&r1=11055&r2=11056&view=diff ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Fri Sep 12 18:25:41 2008 @@ -62,6 +62,23 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + namespace + { + /** Check if alias_r is present in repo/service container. */ + template <class Iterator> + inline bool findAliasIn( const std::string & alias_r, Iterator begin_r, Iterator end_r ) + { + for_( it, begin_r, end_r ) + if ( it->alias() == alias_r ) + return true; + return false; + } + /** \overload */ + template <class Container> + inline bool findAliasIn( const std::string & alias_r, const Container & cont_r ) + { return findAliasIn( alias_r, cont_r.begin(), cont_r.end() ); } + } + /////////////////////////////////////////////////////////////////// // // CLASS NAME : RepoManagerOptions @@ -110,7 +127,7 @@ * Passing this functor as callback, you can collect * all results at the end, without dealing with async * code. - * + * * If targetDistro is set, all repos with non-empty RepoInfo::targetDistribution() * will be skipped. * \todo do this through a separate filter @@ -119,7 +136,7 @@ { RepoCollector() {} - + RepoCollector(const string & targetDistro_) : targetDistro(targetDistro_) {} @@ -1565,36 +1582,34 @@ getRepositoriesInService(service.alias(), insert_iterator (oldRepos, oldRepos.begin())); + //! \todo fix enabled/disable with respect to ServiceInfo reposTo... + // find old to remove for_( it, oldRepos.begin(), oldRepos.end() ) { - bool found = false; - - for_( it2, collector.repos.begin(), collector.repos.end() ) - if ( it->alias() == it2->alias() ) - { - found = true; - break; - } - - if( !found ) + if ( ! findAliasIn( it->alias(), collector.repos ) ) + { removeRepository( *it ); + } } //find new to add for_( it, collector.repos.begin(), collector.repos.end() ) { - bool found = false; - - for_( it2, oldRepos.begin(), oldRepos.end() ) - if( it->alias() == it2->alias() ) - { - found = true; - break; - } + if ( ! findAliasIn( it->alias(), oldRepos ) ) + { +#warning check whether a repo with the same alias exists + // At that point check whether a repo with the same alias + // exists outside this service. Maybe forcefully re-alias + // the existing repo? + + // make sure the service is created in disabled + // autorefresh true. + it->setEnabled( false ); + it->setAutorefresh( true ); - if (!found) addRepository( *it ); + } } } @@ -1648,7 +1663,7 @@ } //! \todo changed enabled status - if ( oldService.enabled() != service.enabled()) + if ( oldService.enabled() != service.enabled() ) { } @@ -1674,7 +1689,7 @@ } } } - + repo::ServiceType RepoManager::probeService( const Url &url ) const { try -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org