Author: lslezak Date: Mon Jan 3 18:30:02 2011 New Revision: 63066 URL: http://svn.opensuse.org/viewcvs/yast?rev=63066&view=rev Log: - fixed VLAN config type detection (wrong regexp) - 2.20.9 Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63066&r1=63065&r2=63066&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Jan 3 18:30:02 2011 @@ -1 +1 @@ -2.20.8 +2.20.9 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=63066&r1=63065&r2=63066&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Mon Jan 3 18:30:02 2011 @@ -183,7 +183,7 @@ global string GetType(string dev) { string type = ifcfg_part (dev, "1"); // test if this is VLAN (ethX.vlanid) - if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\.[[:digit:]]+$")) return "vlan"; + if (type=="eth" && regexpmatch(dev, "^eth[[:digit:]]+\\.[[:digit:]]+$")) return "vlan"; foreach(string dev_type,map confs, Devices, { if (haskey(confs, dev)){ string int_type = confs[dev, "INTERFACETYPE"]:""; Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out?rev=63066&r1=63065&r2=63066&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.out Mon Jan 3 18:30:02 2011 @@ -9,6 +9,8 @@ Dump ifcfg-lo, type: lo Dump ifcfg-eth0#1, type: eth Dump ifcfg-eth1#20, type: eth +Dump ifcfg-eth0.1, type: vlan +Dump ifcfg-eth1.20, type: vlan Dump ifcfg-eth-pcmcia-0#3, type: eth Dump ifcfg-eth-usb-1#0, type: eth Dump ifcfg-tr-pcmcia-2#432, type: tr Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp?rev=63066&r1=63065&r2=63066&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces.ycp Mon Jan 3 18:30:02 2011 @@ -20,6 +20,8 @@ "lo", "eth0#1", "eth1#20", + "eth0.1", + "eth1.20", "eth-pcmcia-0#3", "eth-usb-1#0", "tr-pcmcia-2#432", Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=63066&r1=63065&r2=63066&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jan 3 18:30:02 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 3 17:25:36 UTC 2011 - lslezak@suse.cz + +- fixed VLAN config type detection (wrong regexp) +- 2.20.9 + +------------------------------------------------------------------- Mon Jan 3 16:49:18 UTC 2011 - lslezak@suse.cz - don't abort when package checksum verification failes, ask to -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org