Author: kmachalkova Date: Wed Jan 20 18:02:46 2010 New Revision: 60465 URL: http://svn.opensuse.org/viewcvs/yast?rev=60465&view=rev Log: Now use the library func - look for changes in all components (L.Items, DNS, Routing, N.Config) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp?rev=60465&r1=60464&r2=60465&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/complex.ycp Wed Jan 20 18:02:46 2010 @@ -50,9 +50,9 @@ * Display finished popup * @return dialog result */ -define symbol FinishDialog() ``{ +/*define symbol FinishDialog() ``{ return FinishPopup(Modified(), "lan", "", "mail", ["permanent"]); -} +}*/ /** * Read settings dialog @@ -91,7 +91,7 @@ define symbol WriteDialog() ``{ ScreenName("lan-write"); - if(!Modified()) return `next; + if(!Lan::Modified()) return `next; LanItems::SetModified(); Wizard::RestoreHelp(help["write"]:""); Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp?rev=60465&r1=60464&r2=60465&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp Wed Jan 20 18:02:46 2010 @@ -105,21 +105,22 @@ // FIXME: MOD list<string> DeletedModules = []; +// FIXME: used in lan/address.ycp (#17346) -> "global" + +/*------------------*/ +/* GLOBAL FUNCTIONS */ +/*------------------*/ + /** * Return a modification status * @return true if data was modified */ -boolean Modified() { +global boolean Modified() { boolean ret = LanItems::Modified() || DNS::modified || Routing::Modified() || NetworkConfig::Modified(); return ret; } -// FIXME: used in lan/address.ycp (#17346) -> "global" - -/*------------------*/ -/* GLOBAL FUNCTIONS */ - // function for use from autoinstallation (Fate #301032) global define boolean isAnyInterfaceDown(){ boolean down = false; @@ -387,11 +388,11 @@ global define boolean Write() { y2milestone("Writing configuration"); -// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); - /* Stop the detection */ - //FIXME: not only LanItems - if(!LanItems::modified) { + // Query modified flag in all components, not just LanItems - DNS, + // Routing, NetworkConfig too in order not to discard changes made + // outside LanItems (bnc#439235) + if(!Modified()) { y2milestone("No changes to network setup -> nothing to write"); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org