Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49651 - in /trunk/heartbeat/src: helps.ycp media_conf.ycp wizards.ycp
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Mon, 04 Aug 2008 14:25:31 -0000
  • Message-id: <20080804142532.1B6F63453A@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Mon Aug 4 16:25:31 2008
New Revision: 49651

URL: http://svn.opensuse.org/viewcvs/yast?rev=49651&view=rev
Log:
Changes from SP2 branch merged into trunk

Modified:
trunk/heartbeat/src/helps.ycp
trunk/heartbeat/src/media_conf.ycp
trunk/heartbeat/src/wizards.ycp

Modified: trunk/heartbeat/src/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/helps.ycp?rev=49651&r1=49650&r2=49651&view=diff
==============================================================================
--- trunk/heartbeat/src/helps.ycp (original)
+++ trunk/heartbeat/src/helps.ycp Mon Aug 4 16:25:31 2008
@@ -47,9 +47,8 @@
by entering the <tt>uname -n</tt> command on each node.</p>
") +

- _("<p>If after adding a node to the cluster, you need to specify a
-different node name for that node, double-click the node
-to edit, change the node name, then click <b>Edit</b>.</p>
+ _("<p>If you need to specify a different node name after adding a node to the
cluster,
+double-click the node to edit, change its name, then click <b>Edit</b>.</p>
"),

"media_conf" : _("<p><b>Heartbeat Media Configuration</b> lets you

Modified: trunk/heartbeat/src/media_conf.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/media_conf.ycp?rev=49651&r1=49650&r2=49651&view=diff
==============================================================================
--- trunk/heartbeat/src/media_conf.ycp (original)
+++ trunk/heartbeat/src/media_conf.ycp Mon Aug 4 16:25:31 2008
@@ -10,6 +10,8 @@
textdomain "heartbeat";

import "Label";
+import "FileUtils";
+import "Report";
import "Wizard";
import "Heartbeat";
import "IP";
@@ -66,9 +68,14 @@
Heartbeat::config[cast] = new[cast]:[];
}
});
+
+ string ha_cf = Heartbeat::ha_dir + "/" + "ha.cf";

- foreach(string x, ["udpport", "baud"], {
- if (old[x]:"" != new[x]:"") {
+ //foreach(string x, ["udpport", "baud"], {
+ foreach(string x, [ "udpport" ], {
+ if (old[x]:"" != new[x]:"" || !FileUtils::Exists( ha_cf ) ){
+ //set as modified also if ha.cf does not exist yet
+ //so the data get written (#235834)
Heartbeat::config["modified"] = true;
Heartbeat::config[x] = new[x]:"";
}

Modified: trunk/heartbeat/src/wizards.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/wizards.ycp?rev=49651&r1=49650&r2=49651&view=diff
==============================================================================
--- trunk/heartbeat/src/wizards.ycp (original)
+++ trunk/heartbeat/src/wizards.ycp Mon Aug 4 16:25:31 2008
@@ -129,7 +129,7 @@

any ret = Sequencer::Run(aliases, sequence);

- UI::CloseDialog();
+ Wizard::CloseDialog();
return ret;
}

@@ -151,7 +151,7 @@

any ret = TabSequence();

- UI::CloseDialog();
+ Wizard::CloseDialog();
return ret;
}


--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages