Author: jsrain Date: Thu Feb 3 10:40:45 2011 New Revision: 63318 URL: http://svn.opensuse.org/viewcvs/yast?rev=63318&view=rev Log: more friendly message when license on live CD is missing Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP2-Branch/packager/src/modules/ProductLicense.ycp Modified: branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes?rev=63318&r1=63317&r2=63318&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/package/yast2-packager.changes Thu Feb 3 10:40:45 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 3 10:36:44 CET 2011 - jsrain@suse.cz + +- more friendly message when license on live CD is missing + +------------------------------------------------------------------- Wed Nov 3 20:22:47 UTC 2010 - lslezak@suse.cz - don't reset package selection in the installation proposal when Modified: branches/SuSE-Code-11-SP2-Branch/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/packager/src/modules/ProductLicense.ycp?rev=63318&r1=63317&r2=63318&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/packager/src/modules/ProductLicense.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/packager/src/modules/ProductLicense.ycp Thu Feb 3 10:40:45 2011 @@ -151,8 +151,16 @@ string license_text = (string) SCR::Read(.target.string, license_file); if (license_text == nil) { + if (Mode::live_installation()) { + license_text = sformat ( + "<b>%1</b><br>%2", + sformat(_("Cannot read license file %1"), license_file), + _("To show the product license properly, put the license.tar.gz file to the root of the live media when building the image.") + ); + } else { Report::Error (sformat(_("Cannot read license file %1"), license_file)); license_text = ""; + } } term rt = `Empty(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org