Author: mzugec Date: Thu May 27 14:00:38 2010 New Revision: 62071 URL: http://svn.opensuse.org/viewcvs/yast?rev=62071&view=rev Log: fixed duplicate items issue in UI (bnc#584842) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_proposal.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanUdevAuto.ycp trunk/network/src/modules/NetHwDetection.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62071&r1=62070&r2=62071&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu May 27 14:00:38 2010 @@ -1 +1 @@ -2.19.30 +2.19.31 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=62071&r1=62070&r2=62071&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu May 27 14:00:38 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu May 27 13:54:45 CEST 2010 - mzugec@suse.cz + +- fixed duplicate items issue in UI (bnc#584842) +- 2.19.31 + +------------------------------------------------------------------- Mon May 24 16:56:46 CEST 2010 - mzugec@suse.cz - make add/edit route popup consistent (bnc#583136) Modified: trunk/network/src/clients/lan_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_proposal.ycp?rev=62071&r1=62070&r2=62071&view=diff ============================================================================== --- trunk/network/src/clients/lan_proposal.ycp (original) +++ trunk/network/src/clients/lan_proposal.ycp Thu May 27 14:00:38 2010 @@ -111,7 +111,10 @@ seq = LanAutoSequence ("proposal"); } - if(seq != `next) Lan::Import(stored); + if(seq != `next) { + LanItems::Items = $[]; + Lan::Import(stored); + } ret = $[ "workflow_sequence" : seq ]; Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=62071&r1=62070&r2=62071&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu May 27 14:00:38 2010 @@ -597,7 +597,7 @@ global define boolean Import(map settings) { NetworkInterfaces::Import("netcard", (map) settings["devices"]:$[]); - foreach(string device, NetworkInterfaces::List(""), { + foreach(string device, NetworkInterfaces::List("netcard"), { LanItems::AddNew(); LanItems::Items[LanItems::current]=$["ifcfg":device]; }); Modified: trunk/network/src/modules/LanUdevAuto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanUdevAuto.ycp?rev=62071&r1=62070&r2=62071&view=diff ============================================================================== --- trunk/network/src/modules/LanUdevAuto.ycp (original) +++ trunk/network/src/modules/LanUdevAuto.ycp Thu May 27 14:00:38 2010 @@ -30,7 +30,7 @@ string mac_from_ay = splitstring(tostring(oldname), "-")[2]:""; y2milestone("MAC address from AY : %1", mac_from_ay); foreach(map hw, hardware, { - y2internal("hw %1", hw["mac"]:""); + y2milestone("hw %1", hw["mac"]:""); if (hw["mac"]:""==mac_from_ay){ y2milestone("device matched : %1", hw["dev_name"]:""); newname = hw["dev_name"]:""; @@ -43,7 +43,7 @@ string bus_from_ay = splitstring(tostring(oldname), "-")[2]:""; y2milestone("BUSID from AY : %1", bus_from_ay); foreach(map hw, hardware, { - y2internal("hw %1", hw["busid"]:""); + y2milestone("hw %1", hw["busid"]:""); if (hw["busid"]:""==bus_from_ay){ y2milestone("device matched : %1", hw["dev_name"]:""); newname = hw["dev_name"]:""; @@ -74,7 +74,7 @@ */ list<map> createUdevFromIfaceName(list<map> interfaces){ y2milestone("old-style names for interfaces found - convert into new-style"); - y2internal("interfaces %1", interfaces); + y2milestone("interfaces %1", interfaces); list<map> tmp_interfaces=[]; foreach(map interface, interfaces, { if (issubstring(interface["device"]:"", "-id-")||issubstring(interface["device"]:"", "-bus-")){ @@ -99,9 +99,9 @@ if (oldStyle(settings)) settings["interfaces"] = createUdevFromIfaceName(settings["interfaces"]:[]); else udev_rules = settings["net-udev"]:[]; /* if (Arch::s390())*/ s390_devices=settings["s390-devices"]:[]; - y2internal("interfaces: %1", settings["interfaces"]:[]); - y2internal("net-udev rules:%1", udev_rules); - y2internal("s390-devices rules:%1", s390_devices); + y2milestone("interfaces: %1", settings["interfaces"]:[]); + y2milestone("net-udev rules:%1", udev_rules); + y2milestone("s390-devices rules:%1", s390_devices); return true; } @@ -138,9 +138,9 @@ break; } LanItems::createS390Device(); - y2internal("rule %1", rule); + y2milestone("rule %1", rule); }); - y2internal("Writing s390 rules %1", s390_devices); + y2milestone("Writing s390 rules %1", s390_devices); } return true; } @@ -190,7 +190,7 @@ if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol; map port0 = (map)SCR::Execute(.target.bash_output, sformat("port0=$(ls -l /sys/class/net/%1/device/cdev0);echo ${port0##*/}|tr -d '\n'", device)); -y2internal("port0 %1", port0); + y2milestone("port0 %1", port0); if (size(port0["stdout"]:"")>0){ string value = port0["stdout"]:""; AY["net-udev", device]=$["rule" : "KERNELS", @@ -219,7 +219,7 @@ }); } - y2internal("AY profile %1", AY); + y2milestone("AY profile %1", AY); return AY; } @@ -234,10 +234,10 @@ y2error("No MAC rule %1", row); continue; } else - y2internal("MAC rule %1", row); + y2milestone("MAC rule %1", row); if (mac_rule==mac){ devname=name; - y2internal("Rule matched! New devname %1", devname); + y2milestone("Rule matched! New devname %1", devname); break; } }); Modified: trunk/network/src/modules/NetHwDetection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/NetHwDetection.ycp?rev=62071&r1=62070&r2=62071&view=diff ============================================================================== --- trunk/network/src/modules/NetHwDetection.ycp (original) +++ trunk/network/src/modules/NetHwDetection.ycp Thu May 27 14:00:38 2010 @@ -119,7 +119,7 @@ map output = (map)SCR::Execute(.target.bash_output, command); if (output["exit"]:-1==0){ list<string> interfaces = filter(string s, splitstring(output["stdout"]:"", "\n"), {return (size(s)>0);}); - y2internal("output %1", interfaces); + y2milestone("interfaces %1", interfaces); foreach(string ifc, interfaces, { // TODO: do some tests before uncomment block bellow // if ((integer)SCR::Execute(.target.bash, sformat("ip link show %1|head -n1|grep -q \"[^[:alpha:]]UP[^[:alpha:]]\"", ifc))!=0) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org