Author: locilka Date: Fri Feb 5 16:36:11 2010 New Revision: 60711 URL: http://svn.opensuse.org/viewcvs/yast?rev=60711&view=rev Log: - Adjusting default values for sending optional data during registration: no data before, all data after the migration (BNC #576553). - 2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/include/common_func.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/VERSION?rev=60711&r1=60710&r2=60711&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Fri Feb 5 16:36:11 2010 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes?rev=60711&r1=60710&r2=60711&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Fri Feb 5 16:36:11 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Feb 5 16:12:02 CET 2010 - locilka@suse.cz + +- Adjusting default values for sending optional data during + registration: no data before, all data after the migration + (BNC #576553). +- 2.17.14 + +------------------------------------------------------------------- Wed Feb 3 09:43:21 CET 2010 - locilka@suse.cz - Adapted RPM depenencies to prevent from crashes (BNC #551613). Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp?rev=60711&r1=60710&r2=60711&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp Fri Feb 5 16:36:11 2010 @@ -24,9 +24,12 @@ import "Wagon"; import "Popup"; + import "Mode"; textdomain "wagon"; + include "wagon/common_func.ycp"; + list <string> GetCurrentlyEnabledReposByAlias () { list <string> ret = []; map repo_data = $[]; @@ -47,10 +50,16 @@ // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); + // BNC #576553: Adjusts suse_config sysconfig values according the control file + AdjustSuseRegisterDefaults(); + symbol ret = `auto; while (true) { + // Only in mode=="normal" suse_register reads settings from sysconfig + Mode::SetMode ("normal"); ret = (symbol) WFM::CallFunction ("inst_suse_register", WFM::Args()); + Mode::SetMode ("update"); // `abort, `cancel, `back ... // Just return the symbol Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml?rev=60711&r1=60710&r2=60711&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Fri Feb 5 16:36:11 2010 @@ -242,6 +242,10 @@ <label>Migration Configuration</label> <name>suse_register_workflow</name> <execute>wagon_registration_handler</execute> + <!-- BNC #576553: By default, do not set any optional data --> + <arguments> + none + </arguments> </module> Reply