Author: locilka
Date: Fri Feb 5 16:36:37 2010
New Revision: 60712
URL: http://svn.opensuse.org/viewcvs/yast?rev=60712&view=rev
Log:
- Adjusting default values for sending optional data during
registration: no data before, all data after the migration
(BNC #576553).
Modified:
trunk/wagon/package/yast2-wagon.changes
trunk/wagon/src/clients/wagon_registration_handler.ycp
trunk/wagon/src/config/online_migration.xml
trunk/wagon/src/include/common_func.ycp
Modified: trunk/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=60712&r1=60711&r2=60712&view=diff
==============================================================================
--- trunk/wagon/package/yast2-wagon.changes (original)
+++ trunk/wagon/package/yast2-wagon.changes Fri Feb 5 16:36:37 2010
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+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).
+
+-------------------------------------------------------------------
Wed Feb 3 09:43:21 CET 2010 - locilka@suse.cz
- Adapted RPM depenencies to prevent from crashes (BNC #551613).
Modified: trunk/wagon/src/clients/wagon_registration_handler.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registration_handler.ycp?rev=60712&r1=60711&r2=60712&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_registration_handler.ycp (original)
+++ trunk/wagon/src/clients/wagon_registration_handler.ycp Fri Feb 5 16:36:37 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: trunk/wagon/src/config/online_migration.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migration.xml?rev=60712&r1=60711&r2=60712&view=diff
==============================================================================
--- trunk/wagon/src/config/online_migration.xml (original)
+++ trunk/wagon/src/config/online_migration.xml Fri Feb 5 16:36:37 2010
@@ -243,6 +243,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>
+