Author: jsrain Date: Thu Feb 3 10:40:38 2011 New Revision: 63317 URL: http://svn.opensuse.org/viewcvs/yast?rev=63317&view=rev Log: more friendly message when license on live CD is missing Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=63317&r1=63316&r2=63317&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Thu Feb 3 10:40:38 2011 @@ -1 +1 @@ -2.20.14 +2.20.15 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=63317&r1=63316&r2=63317&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Feb 3 10:40:38 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 3 10:36:24 CET 2011 - jsrain@suse.cz + +- more friendly message when license on live CD is missing +- 2.20.15 + +------------------------------------------------------------------- Thu Jan 20 16:24:45 CET 2011 - mvidner@suse.cz - Edit complete URL by default (by Michal Marek) Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLicense.ycp?rev=63317&r1=63316&r2=63317&view=diff ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Thu Feb 3 10:40:38 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