Author: mcalmer Date: Mon Feb 22 15:07:46 2010 New Revision: 60937 URL: http://svn.opensuse.org/viewcvs/yast?rev=60937&view=rev Log: - fix invalid repo cache after serviceRefresh (bnc#572634) - 2.17.31 Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regist... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Mon Feb 22 15:07:46 2010 @@ -1 +1 @@ -2.17.30 +2.17.31 Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regist... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Mon Feb 22 15:07:46 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 22 15:05:52 CET 2010 - mc@suse.de + +- fix invalid repo cache after serviceRefresh (bnc#572634) +- 2.17.31 + +------------------------------------------------------------------- Mon Feb 8 18:43:30 CET 2010 - jdsn@suse.de - fix repos_to_en/disable flags (bnc#576532) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regist... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp Mon Feb 22 15:07:46 2010 @@ -1336,46 +1336,29 @@ }); - // on successful registration and only if there were changes, we need to refresh all sources - if ( size(summary) > 0 ) - { - // save all changes to the sources that we have done - Pkg::SourceSaveAll(); - - // we can not refresh in autoYaST mode as it may require manual interaction to import keys - if ( doRefresh ) - { - y2milestone("Changes to the repositories and services were successful. Now refreshing all of them."); - - list<string> currentNewServices = Pkg::ServiceAliases(); - foreach ( string serviceAlias, currentNewServices, { - y2milestone("Refreshing service with Alias: %1", serviceAlias); - Pkg::ServiceRefresh(serviceAlias); - }); - - list<integer> currentNewSources = Pkg::SourceGetCurrent( true ); - foreach (integer srcID, currentNewSources, { - y2milestone("Refreshing source with ID: %1", srcID); - // no "forced" refresh needed - default is sufficient (bnc#476429) - Pkg::SourceRefreshNow(srcID); - }); - } - } + // save all changes to the sources that we have done + Pkg::SourceSaveAll(); // finish sources (bnc#447080) + if ( Pkg::SourceFinishAll() ) { - y2milestone("Successfully finished all sources to enforce a reload."); - - // restart the SourceManager to refill the cache with the current data (bnc#468449) - // an application that called the registration (or that follows it) should be presented an updated pkg system - if ( Pkg::SourceStartManager(true) ) - { - y2milestone("Successfully restarted source manager."); - } - else + y2milestone("Successfully finished all sources."); + // we can not refresh in autoYaST mode as it may require manual interaction to import keys + if ( doRefresh ) { - y2error("Failed to restart source manager"); + y2milestone("Enforce a reload."); + + // restart the SourceManager to refill the cache with the current data (bnc#468449 bnc#572634) + // an application that called the registration (or that follows it) should be presented an updated pkg system + if ( Pkg::SourceStartManager(true) ) + { + y2milestone("Successfully restarted source manager."); + } + else + { + y2error("Failed to restart source manager"); + } } } else -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org