Author: kmachalkova Date: Mon Mar 17 12:46:55 2008 New Revision: 45510 URL: http://svn.opensuse.org/viewcvs/yast?rev=45510&view=rev Log: - Respect ha.cf file ordering (first udp port, then media) (bnc#235834) Modified: branches/SuSE-SLE-10-SP2-Branch/heartbeat/VERSION branches/SuSE-SLE-10-SP2-Branch/heartbeat/package/yast2-heartbeat.changes branches/SuSE-SLE-10-SP2-Branch/heartbeat/src/media_conf.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/heartbeat/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/heartbeat/VERSION?rev=45510&r1=45509&r2=45510&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/heartbeat/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/heartbeat/VERSION Mon Mar 17 12:46:55 2008 @@ -1 +1 @@ -2.13.11 +2.13.12 Modified: branches/SuSE-SLE-10-SP2-Branch/heartbeat/package/yast2-heartbeat.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/heartbeat/package/yast2-heartbeat.changes?rev=45510&r1=45509&r2=45510&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/heartbeat/package/yast2-heartbeat.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/heartbeat/package/yast2-heartbeat.changes Mon Mar 17 12:46:55 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 14 15:36:58 CET 2008 - kmachalkova@suse.cz + +- Respect ha.cf file ordering (first udp port, then media) + (bnc#235834) +- 2.13.12 + +------------------------------------------------------------------- Wed Jan 16 10:22:25 CET 2008 - kmachalkova@suse.cz - Merged proofread texts Modified: branches/SuSE-SLE-10-SP2-Branch/heartbeat/src/media_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/heartbeat/src/media_conf.ycp?rev=45510&r1=45509&r2=45510&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/heartbeat/src/media_conf.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/heartbeat/src/media_conf.ycp Mon Mar 17 12:46:55 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]:""; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org