Author: jdsn Date: Mon Feb 8 18:33:48 2010 New Revision: 60751 URL: http://svn.opensuse.org/viewcvs/yast?rev=60751&view=rev Log: always reset registration server url - port from SP1 (bnc#557194) adding ported fix from SP1 to 2.17.28.1 Modified: branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes?rev=60751&r1=60750&r2=60751&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes Mon Feb 8 18:33:48 2010 @@ -3,6 +3,7 @@ - fix repos_to_en/disable flags (bnc#576532) - force reload of SourceManager (bnc#576532) +- always reset registration server url - port from SP1 (bnc#557194) - 2.17.28.1 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp?rev=60751&r1=60750&r2=60751&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-Code-11-Branch/registration/src/modules/Register.ycp Mon Feb 8 18:33:48 2010 @@ -280,6 +280,8 @@ */ global symbol setupRegistrationServer(symbol mode) { + // invalidate a previous registration initialization as now settings may change (bnc#557194) + isInitializedSR = false; // in case smt_server is undefined nothing needs to be done if (smt_server == nil || smt_server == "") return `ok; @@ -1020,12 +1022,12 @@ list<string> newToDisable = []; // filter out "repos_to_enable" that are requested to be disabled (bnc#576532) - newToEnable = filter(string oneCatalog, union(currentToEnable, catalogToEnable), { + newToEnable = filter(string oneCatalog, (list<string>) union(currentToEnable, catalogToEnable), { return ! contains(catalogToDisable, oneCatalog); }); // filter out "repos_to_disable" that are requested to be enabled (bnc#576532) - newToDisable = filter(string oneCatalog, union(currentToDisable, catalogToDisable), { + newToDisable = filter(string oneCatalog, (list<string>) union(currentToDisable, catalogToDisable), { return ! contains(catalogToEnable, oneCatalog); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org