Author: jdsn Date: Tue Feb 17 22:07:49 2009 New Revision: 55574 URL: http://svn.opensuse.org/viewcvs/yast?rev=55574&view=rev Log: fix autoyast registration; fix ported from SLE11 (bnc#476494) without network connection skip registration (bnc#475795) Modified: trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp 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=55574&r1=55573&r2=55574&view=diff ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Tue Feb 17 22:07:49 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 17 21:46:59 CET 2009 - jdsn@suse.de + +- fix autoyast registration; fix ported from SLE11 (bnc#476494) +- without network connection skip registration (bnc#475795) + +------------------------------------------------------------------- Tue Jan 27 17:35:44 CET 2009 - jdsn@suse.de - use OKDialog for online_update_configuration (bnc#440568) 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=55574&r1=55573&r2=55574&view=diff ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Tue Feb 17 22:07:49 2009 @@ -25,6 +25,7 @@ import "CustomDialogs"; import "Directory"; import "Mode"; + import "Stage"; import "String"; import "Label"; import "Internet"; @@ -34,6 +35,7 @@ import "Package"; import "PackageCallbacks"; import "CommandLine"; + import "NetworkService"; include "registration/texts.ycp"; @@ -62,9 +64,10 @@ } // no network - no suse_register - if (!Mode::normal() && !Internet::suse_register) + // test for existing network connection (bnc#475795) + if ( Stage::cont() && ( !Internet::suse_register || !NetworkService::isNetworkRunning() ) ) { - y2error("The internet test failed or was skipped. So registration will not run."); + y2error("The internet test failed or no network connection is available. Registration will be skipped."); Internet::do_you = false; return `auto; } Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Register.ycp?rev=55574&r1=55573&r2=55574&view=diff ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Tue Feb 17 22:07:49 2009 @@ -1375,12 +1375,17 @@ if ( registration_data != $[] ) { // append sensitive data to the context map + // collect data inside of the args keyword (bnc#476494) + contextData["args"] = registration_data; + + // do not log sensitive data to the log (#195624) + y2milestone("Added sensitive registration data to suse_register call - the data will not be logged, only the used keys"); + + // list the used keys in the log foreach (string key, string val, registration_data, { - key = String::CutRegexMatch(key, "[^A-Za-z0-9_-]+", true ); - contextData[key] = sformat("%1", String::Quote(val)); + y2milestone("Added sensitive registration data for the key: %1", key); }); - // do not log sensitive data to the log (#195624) - y2milestone ("Added sensitive registration data to suse_register call - this data is not logged"); + } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org