Author: jdsn Date: Mon Jan 26 17:51:26 2009 New Revision: 55051 URL: http://svn.opensuse.org/viewcvs/yast?rev=55051&view=rev Log: porting bugfixes from SLE11 to trunk: keep target initialized on exit (bnc#468449) setup proxy before suseRegister initializes (bnc#468480) setup http and https proxy settings individually (bnc#468919) Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/Register.ycp Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-registration.changes?rev=55051&r1=55050&r2=55051&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Mon Jan 26 17:51:26 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 26 17:48:44 CET 2009 - jdsn@suse.de + +- keep target initialized on exit (bnc#468449) +- setup proxy before suseRegister initializes (bnc#468480) +- setup http and https proxy settings individually (bnc#468919) + +------------------------------------------------------------------- Mon Dec 1 18:21:35 CET 2008 - jdsn@suse.de - fix detection of base product (bnc#449844) Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=55051&r1=55050&r2=55051&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Mon Jan 26 17:51:26 2009 @@ -907,19 +907,7 @@ // reset YSRs context YSR::del_ctx(); isInitializedSR = false; - if ( isInitializedTarget ) - { - y2milestone("Package target was initialized. Now finishing target usage."); - if ( Pkg::TargetFinish() ) - { - y2milestone("Successfully finished the target usage of the package system."); - isInitializedTarget = false; - } - else - { - y2error("Could not finish the target usage of the package system."); - } - } + // do no longer call TargetFinish (bnc#468449) } @@ -1446,6 +1434,34 @@ // Pkg::CallbackAuthentication(nil); } + // setting the proxy must happen before init_ctx is called (bnc#468480) + // setting up proxy for SuseRegister + if (Register::use_proxy) + { + // setup proxy for http and https individually (bnc#468919) + if (Register::http_proxy == nil) + { + Register::http_proxy = ""; + y2error("Setting for http proxy is broken. Resetting http proxy. Registration will not use an http proxy."); + } + + if (Register::https_proxy == nil) + { + Register::https_proxy = ""; + y2error("Setting for https proxy is broken. Resetting https proxy. Registration will not use an https proxy."); + } + + if (Register::http_proxy != "" || Register::https_proxy != "") + { + y2milestone("Setting up proxy for SuseRegister. http_proxy: %1 -- https_proxy: %2", Register::http_proxy, Register::https_proxy); + YSR::set_proxy(Register::http_proxy, Register::https_proxy); + } + else + { + y2milestone("No proxy settings will be used for registration and SuseRegister."); + } + } + // initialize SuseRegister contextDataSR = contextData; y2milestone("Initializing SuseRegister with this context data: %1", contextDataSR); @@ -1462,20 +1478,6 @@ y2error("Initializing SuseRegister failed with error code (%1) and error message: %2", initErrorCode, YSR::get_errormsg()); return initErrorCode; } - - // setting up proxy for SuseRegister - if (Register::use_proxy) - { - if (Register::http_proxy != nil && Register::https_proxy != nil) - { - y2milestone("Setting up proxy for SuseRegister. http_proxy: %1 -- https_proxy: %2", Register::http_proxy, Register::https_proxy); - YSR::set_proxy(Register::http_proxy, Register::https_proxy); - } - else - { - y2error("Proxy settings are broken and could not be applied to SuseRegister."); - } - } } // ----==== handle modes for suseRegister ====---- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org