Author: jdsn Date: Tue Oct 14 20:39:39 2008 New Revision: 52202 URL: http://svn.opensuse.org/viewcvs/yast?rev=52202&view=rev Log: - check if initialization of SuseRegister succeeds (bnc#435188) - initialize the target to prevent repeated key import (bnc#435192) - adapting repo changes as well in autoYaST mode - 2.17.3 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/modules/Register.ycp Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52202&r1=52201&r2=52202&view=diff ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Tue Oct 14 20:39:39 2008 @@ -1 +1 @@ -2.17.2 +2.17.3 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=52202&r1=52201&r2=52202&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Tue Oct 14 20:39:39 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 14 18:06:33 CEST 2008 - jdsn@suse.de + +- check if initialization of SuseRegister succeeds (bnc#435188) +- initialize the target to prevent repeated key import (bnc#435192) +- adapting repo changes as well in autoYaST mode +- 2.17.3 + +------------------------------------------------------------------- Mon Oct 13 18:38:31 CEST 2008 - jdsn@suse.de - support repository changes in catalogs (bnc#430896) Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_suse_register.ycp?rev=52202&r1=52201&r2=52202&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Tue Oct 14 20:39:39 2008 @@ -243,6 +243,9 @@ string details = _("Details..."); string error_msg = _("Error"); string starting_browser = _("Starting browser..."); + string error_target_init_failed = _("Initialization failed.\nCan not interact with the package system."); + string message_install_missing_packages = _("In order to registrer properly the system +needs to install the following packages."); /* other string variables */ string information_text = ""; @@ -867,13 +870,12 @@ if ( taskList != $[] ) { - // add/delete/change repositories - string oldMessage = _("Setting up online update source..."); string newMessage = _("Updating software repositories..."); UI::OpenDialog(`VBox(`Label( oldMessage ))); - repoSummary = Register::updateSoftwareRepositories(taskList); + // add/delete/change repositories + repoSummary = Register::updateSoftwareRepositories(taskList, true); // #186978 - hide the passwords of the urls in the status window // now obsolete - the summary created by "updateSoftwareRepositories" will not contain passwords of URLs @@ -886,13 +888,6 @@ // (#261239) show success popup only on success else error message if (repoSummary != nil && size(repoSummary) != 0) { - // on successful registration and only if there were changes, we need to refresh all sources - list<integer> currentSources = Pkg::SourceGetCurrent( true ); - foreach (integer srcID, currentSources, { - y2milestone("Refreshing source with ID: %1", srcID); - Pkg::SourceForceRefreshNow(srcID); - }); - UI::OpenDialog( nccc_success ); repeat { @@ -941,8 +936,16 @@ } + // error handling - initialization of target failed + if ( SRstatus == 113 ) + { + Popup::Message(error_target_init_failed); + loopend = true; + } + + // handle any other error codes - if ( contains([0, 1, 3, 101, 198, 199], SRstatus) == false ) + if ( contains([0, 1, 3, 101, 113, 198, 199], SRstatus) == false ) { // display error message error_msg_details = YSR::get_errormsg(); @@ -950,6 +953,15 @@ error_msg_details = ""; } +/* + DOCUMENTATION OF ERROR CODES + * 111: a generic unknown error uccurred during a SuseRegister call + * 112: the initialization of SuseRegister failed; no special message is used for that though + * 113: the initialization if the target failed - no interaction with the package system possible + * 198: the system did not find any browser to let the user perform the manual interaction part of the registration + * 199: unknown error uccurred (no longer used) +*/ + } else { Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=52202&r1=52201&r2=52202&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Tue Oct 14 20:39:39 2008 @@ -24,7 +24,7 @@ import "YSR"; import "ProductFeatures"; import "SourceManager"; - +import "Installation"; // -------------------------------------------------------------- // START: Locally defined data @@ -32,9 +32,11 @@ string services_file = sformat ("%1/update_services", SCR::Read (.target.tmpdir)); boolean isInitializedSR = false; +boolean isInitializedTarget = false; map contextDataSR = nil; map > argsDataSR = nil; integer initialSRstatus = nil; + // ------------------------------------------------------------------ // END: Locally defined data // ------------------------------------------------------------------ @@ -692,6 +694,7 @@ SCR::Write(.sysconfig.suse_register.SUBMIT_OPTIONAL, sformat("%1", submit_optional ? true:false )); SCR::Write(.sysconfig.suse_register.SUBMIT_HWDATA, sformat("%1", submit_hwdata ? true:false )); + if ( register_regularly == nil ) register_regularly = false; SCR::Execute(.target.bash, sformat("%1 /var/lib/suseRegister/neverRegisterOnBoot", register_regularly ? "rm -f ":"touch " )); // touch a flag file for opensuseupdater SCR::Execute(.target.bash, sformat("touch /var/lib/YaST2/registrationDidRun")); @@ -939,7 +942,7 @@ * takes a "taskList"-map from SuseRegister and updates the repositories * @return a list with a small summary (added/deleted/enabled/disabled repos) */ -global list<string> updateSoftwareRepositories(map taskList) +global list<string> updateSoftwareRepositories(map taskList, boolean doRefresh) { // see if there are actions to perform if (taskList == $[]) @@ -1083,9 +1086,8 @@ // ------------------->>>>> FIXME // need to save service to the system first?? // documentation of Pkg::ServiceRefresh says : "Refresh the service, the service must already be saved on the system!" - // is this done with Pkg::SourceSaveAll() ?? - // service != source ?? + // service != source ?? /* if ( Pkg::SourceSaveAll() ) { @@ -1097,9 +1099,8 @@ } */ - // then need to call Pkg::ServiceRefresh() - //if ( Pkg::ServiceRefresh(pService) ) - if (true) + // need to call Pkg::ServiceRefresh() before checking the catalogs + if ( Pkg::ServiceRefresh(pService) ) { y2milestone("Successfully refreshed service: %1", pService); } @@ -1157,6 +1158,23 @@ }); + // 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 ) + { + list<integer> currentSources = Pkg::SourceGetCurrent( true ); + foreach (integer srcID, currentSources, { + y2milestone("Refreshing source with ID: %1", srcID); + Pkg::SourceForceRefreshNow(srcID); + }); + } + } + return summary; } @@ -1192,10 +1210,20 @@ } - if (! isInitializedSR || contextData != contextDataSR ) + if ( ! isInitializedSR || ! isInitializedTarget || contextData != contextDataSR ) { - if ( ! isInitializedSR ) + // initialize target + if ( ! isInitializedTarget ) { + string targetRootDir = Mode::normal() ? "/":Installation::destdir; + if ( ! Pkg::TargetInitialize(targetRootDir) ) + { + y2error("Initializing the target failed via Pkg::TargetInitialize. No interaction with the package system is possible."); + return 113; + } + y2milestone("Successfully initialized the target."); + isInitializedTarget = true; + // refresh all sources/services _once_ before interacting with SuseRegister allCurrentSources = Pkg::SourceStartCache(true); foreach ( integer srcID, allCurrentSources, { @@ -1208,7 +1236,16 @@ contextDataSR = contextData; y2milestone("Initializing SuseRegister with this context data: %1", contextDataSR); YSR::init_ctx(contextDataSR); - isInitializedSR = true; + + if ( YSR::get_errorcode() == 0 ) + { + isInitializedSR = true; + } + else + { + y2error("Initializing SuseRegister failed with error code (%1) and error message: %2", YSR::get_errorcode(), YSR::get_errormsg()); + return 112; + } // setting up proxy for SuseRegister if (Register::use_proxy) @@ -1276,18 +1313,25 @@ if ( parameter == `autoyast ) { y2milestone("SuseRegister was called in autoYaST mode. The overall registration satus is: %1", initialSRstatus); - if ( initialSRstatus == 1 ) + if ( initialSRstatus == 0 ) + { + y2milestone("Registeration in autoYaST mode succeeded. Now checking the repositories."); + // in autoyast mode this must be called from here + map taskList = YSR::getTaskList(); + if ( taskList == $[] ) + { + y2milestone("According to SuseRegister no repositories need to be changed."); + } + else + { + updateSoftwareRepositories(taskList, false); + } + } + else if ( initialSRstatus == 1 ) { y2error("Manual interaction is required for proper registration which is not possible during autoYaST. Please register manually."); } - y2milestone("All sources will be refreshed now."); - // refresh all sources/services - allCurrentSources = Pkg::SourceStartCache(true); - foreach ( integer srcID, allCurrentSources, { - y2milestone("Refreshing source with ID: %1", srcID); - Pkg::SourceForceRefreshNow(srcID); - }); } y2milestone("SuseRegister status: %1", initialSRstatus); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org