Author: jdsn Date: Wed Mar 5 12:20:43 2008 New Revision: 45203 URL: http://svn.opensuse.org/viewcvs/yast?rev=45203&view=rev Log: fix for issues coming from merge with trunk (#367184) Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/VERSION?rev=45203&r1=45202&r2=45203&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/VERSION Wed Mar 5 12:20:43 2008 @@ -1 +1 @@ -2.13.17 +2.13.18 Modified: branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes?rev=45203&r1=45202&r2=45203&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/package/yast2-registration.changes Wed Mar 5 12:20:43 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Mar 5 12:06:05 CET 2008 - jdsn@suse.de + +- fix for issues coming from merge with trunk (#367184) +- 2.13.28 + +------------------------------------------------------------------- Wed Feb 27 18:13:45 CET 2008 - jdsn@suse.de - renaming YEP to SMT Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp?rev=45203&r1=45202&r2=45203&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/clients/inst_suse_register.ycp Wed Mar 5 12:20:43 2008 @@ -284,8 +284,8 @@ `HBox( `HWeight(1, `PushButton(`id(`back), Label::BackButton() ) ), `HSpacing( 3 ), - // reactivated skipping the registration (#240174) - `HWeight(1, `PushButton(`id(`skip), Label::SkipButton() ) ), + // reactivated skipping the registration (#240174) - fixed for (#367184) + `HWeight(1, `PushButton(`id(`skip), _("&Skip") ) ), `HSpacing( 3 ), `HWeight(1, `PushButton(`id(`err_detail), details ) ) ) @@ -497,7 +497,8 @@ else { // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310) - string required_package = "mozilla-xulrunner181"; + // SLE10 does not have mozilla-xulrunner181 but mozilla-xulrunner (#367184) + string required_package = "mozilla-xulrunner"; if (!Package::Installed(required_package)) { Package::InstallAllMsg([required_package], nil); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org