Hi, YaST hackers, this is just a friendly reminder. Please try to stick to coding rules, as outlined here: http://forgeftp.novell.com/yast/doc/SL11.1/codingrules/index.html (if the rules are outdated, then let's fix them) You're going make maintenance of the code easier, not only for yourself but also for those who come after you ("Always code as if the guy who ends up maintaining your code will be violent psychopath who knows where you live." -- John F. Woods"). And this is how NOT to do it :D http://freeworld.thc.org/root/phun/unmaintain.html

URL: http://svn.opensuse.org/viewcvs/yast?rev=60444&view=rev Log: Normal indentation. See also: http://forgeftp.novell.com/yast/doc/SL11.1/codingrules/indentation.html

Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Lan.ycp

8< ---- shortened -------->8

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/netw ork/src/modules/Lan.ycp?rev=60444&r1=60443&r2=60444&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 Tue Jan 19 13:15:51 2010 @@ -383,6 +383,7 @@ // if(!write_only && NetHwDetection::running) NetHwDetection::Stop();

/* Stop the detection */ + //FIXME: not only LanItems if(!LanItems::modified) { y2milestone("No changes to network setup -> nothing to write"); return true; @@ -434,7 +435,8 @@ if(Abort()) return false; /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); - if (!Mode::autoinst()) LanItems::WriteUdevDriverRules(); + if (!Mode::autoinst()) + LanItems::WriteUdevDriverRules(); NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); @@ -483,94 +485,99 @@ }

if(!write_only) { - if(Abort()) return false; - /* Progress step 9 */ - ProgressNextStage(_("Activating network services...")); -// NetworkModules::HwUp (); - // during installation export sysconfig settings into NetworkManager (bnc#433084) - if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); - -y2internal("virt_net_proposal %1", virt_net_proposal); - if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { - UI::OpenDialog(`opt(`decorated), `HBox( - `HSpacing(1), - `HCenter(`HSquash(`VBox( - `HCenter(`HSquash(`VBox( 8< ---- shortened -------->8 -- \\\\\ Katarina Machalkova \\\\\\\__o YaST developer __\\\\\\\'/_ & hedgehog painter