Author: locilka Date: Thu Nov 19 16:59:25 2009 New Revision: 59629 URL: http://svn.opensuse.org/viewcvs/yast?rev=59629&view=rev Log: - Added control file configuration option require_registration (FATE #305578). Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc branches/SuSE-Code-11-SP1-Branch/installation/control/docs/control-section.xml branches/SuSE-Code-11-SP1-Branch/installation/control/examples/add-on-2.xml branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_upgrade_urls.ycp Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc?rev=59629&r1=59628&r2=59629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/control.rnc Thu Nov 19 16:59:25 2009 @@ -81,6 +81,7 @@ | timezone | enable_autologin | runlevel + | require_registration additional_kernel_parameters = element additional_kernel_parameters { text } incomplete_translation_treshold = element incomplete_translation_treshold { text } @@ -120,6 +121,7 @@ rle_offer_rulevel_4 = element rle_offer_rulevel_4 { BOOLEAN } default_ntp_setup = element default_ntp_setup { BOOLEAN } enable_kdump = element enable_kdump { BOOLEAN } +require_registration = element require_registration { BOOLEAN } save_instsys_content = element save_instsys_content { LIST, Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/docs/control-section.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/docs/control-section.xml?rev=59629&r1=59628&r2=59629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/docs/control-section.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/docs/control-section.xml Thu Nov 19 16:59:25 2009 @@ -415,6 +415,10 @@ <listitem><para>(string) <emphasis>polkit_default_privs</emphasis> - Adjusts <emphasis>/etc/sysconfig/security/POLKIT_DEFAULT_PRIVS</emphasis> to the defined value. If not set or empty, sysconfig is untouched.</para></listitem> + + <!-- FATE #305578: Add-On Product Requiring Registration --> + <listitem><para>(boolean) <emphasis>require_registration</emphasis> - Require registration + of add-on product (ignored in the base product).</para></listitem> </itemizedlist> </section> Modified: branches/SuSE-Code-11-SP1-Branch/installation/control/examples/add-on-2.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/control/examples/add-on-2.xml?rev=59629&r1=59628&r2=59629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/control/examples/add-on-2.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/control/examples/add-on-2.xml Thu Nov 19 16:59:25 2009 @@ -6,6 +6,8 @@ <!-- these options override base product's ones --> <globals> <additional_kernel_parameters></additional_kernel_parameters> + <!-- Registration of this add-on will be required --> + <require_registration config:type="boolean">true</require_registration> </globals> <software> <selection_type config:type="symbol">auto</selection_type> Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes?rev=59629&r1=59628&r2=59629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Thu Nov 19 16:59:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 19 16:51:55 CET 2009 - locilka@suse.cz + +- Added control file configuration option require_registration + (FATE #305578). + +------------------------------------------------------------------- Fri Nov 13 13:36:11 CEST 2009 - locilka@suse.cz - Fixed handling repositories during upgrade (bnc #543468). Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_upgrade_urls.ycp?rev=59629&r1=59628&r2=59629&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_upgrade_urls.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/inst_upgrade_urls.ycp Thu Nov 19 16:59:25 2009 @@ -683,12 +683,19 @@ "base_urls" : [one_url], "prod_dir" : pth, "type" : repo_type, + // bnc #543468, do not check aliases of repositories stored in Installation::destdir + "check_alias" : false, ]; AdjustRepoSettings (repoadd, one_id); y2milestone ("Adding repo (enabled): %1", repoadd); integer new_id = Pkg::RepositoryAdd (repoadd); + if (new_id == nil) { + y2error ("Error adding repository: %1", repoadd); + return; + } + if (new_id > -1) { boolean repo_refresh = Pkg::SourceRefreshNow (new_id); y2milestone ("Repository refreshed: %1", repo_refresh); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org