Author: jdsn Date: Wed Feb 6 20:04:12 2008 New Revision: 44215 URL: http://svn.opensuse.org/viewcvs/yast?rev=44215&view=rev Log: fixing YEP installation error messages Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp?rev=44215&r1=44214&r2=44215&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/registration/src/modules/Register.ycp Wed Feb 6 20:04:12 2008 @@ -148,7 +148,7 @@ string question = _("Do you want to skip Registration?"); string otherwise = sformat( _("If you select %1 the Registration will most likely fail. Otherwise you may copy the certificate file to the system manually -and then specify its path by choosing %2."), deletechars(Label::FileName(), "&"), deletechars(Label::ContinueButton(), "&")); +and then specify its path by choosing %2."), deletechars(Label::ContinueButton(), "&"), deletechars(Label::FileName(), "&") ); string errorMessage = ""; if (type == `floppy) @@ -452,12 +452,13 @@ } else { - string fileErrorHeader = _("Could not copy local file"); + y2milestone("Could not copy local file as YEP certificate"); + string fileErrorHeader = _("Could not copy certificate file"); string fileErrorMsg = _("Do you want to retry?"); if (!Popup::YesNoHeadline(fileErrorHeader, fileErrorMsg)) { - y2milestone("Could not copy local file as YEP certificate"); - exitloop = true; + y2milestone("User selected to skip the setup of a YEP certificate"); + return `conferror; } } @@ -560,6 +561,8 @@ y2error("Failed to install YEP certificate to common cert storage. Registration would fail and thus will be skipped."); if (instretZMD == 0) y2error("Failed to install YEP certificate for ZMD. Registration would fail and thus will be skipped."); + + if (!ay) Popup::Message(_("Installation of the YEP certificates failed.\nPlease see the logs for further information.")); return `silentskip; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org