Author: locilka
Date: Wed Jun 24 17:10:53 2009
New Revision: 57735
URL: http://svn.opensuse.org/viewcvs/yast?rev=57735&view=rev
Log:
- Not offering installation images if there are none (bnc #492745).
Modified:
trunk/installation/package/yast2-installation.changes
trunk/installation/src/clients/deploying_proposal.ycp
trunk/installation/src/modules/ImageInstallation.ycp
Modified: trunk/installation/package/yast2-installation.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=57735&r1=57734&r2=57735&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Wed Jun 24 17:10:53 2009
@@ -3,6 +3,7 @@
- Fixed Welcome dialog layout to have more license content visible
and to align language and keyboard widgets with it.
+- Not offering installation images if there are none (bnc #492745).
-------------------------------------------------------------------
Mon Jun 22 20:20:18 CEST 2009 - coolo@novell.com
Modified: trunk/installation/src/clients/deploying_proposal.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/deploying_proposal.ycp?rev=57735&r1=57734&r2=57735&view=diff
==============================================================================
--- trunk/installation/src/clients/deploying_proposal.ycp (original)
+++ trunk/installation/src/clients/deploying_proposal.ycp Wed Jun 24 17:10:53 2009
@@ -29,7 +29,10 @@
string ret = "<ul>\n";
- if (im_conf["deploying_enabled"]:false == true) {
+ if (ImageInstallation::image_installation_available == false) {
+ // TRANSLATORS: Installation overview
+ ret = ret + "<li>" + _("No installation images are available") + "</li>";
+ } else if (im_conf["deploying_enabled"]:false == true) {
ret = ret + "<li>" + sformat (
// TRANSLATORS: Installation overview
// IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
Modified: trunk/installation/src/modules/ImageInstallation.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageInstallation.ycp?rev=57735&r1=57734&r2=57735&view=diff
==============================================================================
--- trunk/installation/src/modules/ImageInstallation.ycp (original)
+++ trunk/installation/src/modules/ImageInstallation.ycp Wed Jun 24 17:10:53 2009
@@ -113,6 +113,11 @@
global boolean changed_by_user = false;
+/**
+ * Defines whether some installation images are available
+ */
+global boolean image_installation_available = nil;
+
boolean debug_mode = nil;
boolean ThisIsADebugMode () {
@@ -707,8 +712,9 @@
if (filename == nil)
{
+ image_installation_available = false;
Installation::image_installation = false;
- Installation::image_only= false;
+ Installation::image_only = false;
y2milestone ("Image list for installation not found");
return true;
}
@@ -716,13 +722,17 @@
map