Author: mvidner Date: Wed Aug 31 16:28:04 2011 New Revision: 65480 URL: http://svn.opensuse.org/viewcvs/yast?rev=65480&view=rev Log: Update Deleted and OriginalDevices in NetworkInterfaces::Write not to write them over and over in subsequent calls via YaPI Author: Justus Winter Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/NetworkInterfaces.ycp trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=65480&r1=65479&r2=65480&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Aug 31 16:28:04 2011 @@ -1 +1 @@ -2.21.13 +2.21.14 Modified: trunk/yast2/library/network/src/NetworkInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/NetworkInterfaces.ycp?rev=65480&r1=65479&r2=65480&view=diff ============================================================================== --- trunk/yast2/library/network/src/NetworkInterfaces.ycp (original) +++ trunk/yast2/library/network/src/NetworkInterfaces.ycp Wed Aug 31 16:28:04 2011 @@ -747,6 +747,7 @@ }); } }); + Deleted = []; /* Devices with chmod=0600 */ list<string> chmod = []; @@ -829,6 +830,14 @@ y2debug("CHANGED"); chmod = add(chmod, file); } + + if (OriginalDevices == nil) { + OriginalDevices = $[]; + } + if (OriginalDevices[typ]:nil == nil) { + OriginalDevices[typ] = $[]; + } + OriginalDevices[typ, config] = Devices[typ, config]:$[]; }); }); @@ -842,10 +851,6 @@ SCR::Execute(.target.bash, "/bin/chmod 0600 " + file); }); - // Deleted = []; - // OriginalDevices = Devices; - // Cannot do it because we have written only part of Devices. - // This module should be rewritten to objects. return true; } Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out?rev=65480&r1=65479&r2=65480&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.out Wed Aug 31 16:28:04 2011 @@ -90,20 +90,6 @@ Return true Dump all=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hippi": $["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Write -Write .network.value."arc5".BOOTPROTO "dhcp" true -Write .network.value."arc5".STARTMODE "manual" true -Write .network.value."atm5".BOOTPROTO "dhcp" true -Write .network.value."atm5".STARTMODE "manual" true -Write .network.value."ci5".BOOTPROTO "dhcp" true -Write .network.value."ci5".STARTMODE "manual" true -Write .network.value."ctc5".BOOTPROTO "dhcp" true -Write .network.value."ctc5".STARTMODE "manual" true -Write .network.value."dummy5".BOOTPROTO "static" true -Write .network.value."dummy5".IPADDR "1.2.3.4/8" true -Write .network.value."dummy5".PREFIXLEN "8" true -Write .network.value."dummy5".STARTMODE "manual" true -Write .network.value."escon5".BOOTPROTO "dhcp" true -Write .network.value."escon5".STARTMODE "manual" true Write .network.value."eth5".BOOTPROTO "dhcp" true Write .network.value."eth5".STARTMODE "manual" true Write .network.value."eth6".BOOTPROTO "static" true @@ -120,14 +106,41 @@ Write .network.value."mynet0".BOOTPROTO "dhcp" true Write .network.value."mynet0".INTERFACETYPE "eth" true Write .network.value."mynet0".STARTMODE "auto" true +Write .network nil true +Return true +Write .network.value."ppp5".BOOTPROTO "dhcp" true +Write .network.value."ppp5".STARTMODE "manual" true +Write .network nil true +Return true +Write .network.value."ippp5".BOOTPROTO "dhcp" true +Write .network.value."ippp5".STARTMODE "manual" true +Write .network nil true +Return true +Return true +Write .network.value."atm5".BOOTPROTO "dhcp" true +Write .network.value."atm5".STARTMODE "manual" true +Write .network.value."tr5".BOOTPROTO "dhcp" true +Write .network.value."tr5".STARTMODE "manual" true +Write .network nil true +Return true +Write .network.value."arc5".BOOTPROTO "dhcp" true +Write .network.value."arc5".STARTMODE "manual" true +Write .network.value."ci5".BOOTPROTO "dhcp" true +Write .network.value."ci5".STARTMODE "manual" true +Write .network.value."ctc5".BOOTPROTO "dhcp" true +Write .network.value."ctc5".STARTMODE "manual" true +Write .network.value."dummy5".BOOTPROTO "static" true +Write .network.value."dummy5".IPADDR "1.2.3.4/8" true +Write .network.value."dummy5".PREFIXLEN "8" true +Write .network.value."dummy5".STARTMODE "manual" true +Write .network.value."escon5".BOOTPROTO "dhcp" true +Write .network.value."escon5".STARTMODE "manual" true Write .network.value."fddi5".BOOTPROTO "dhcp" true Write .network.value."fddi5".STARTMODE "manual" true Write .network.value."hippi5".BOOTPROTO "dhcp" true Write .network.value."hippi5".STARTMODE "manual" true Write .network.value."hsi5".BOOTPROTO "dhcp" true Write .network.value."hsi5".STARTMODE "manual" true -Write .network.value."ippp5".BOOTPROTO "dhcp" true -Write .network.value."ippp5".STARTMODE "manual" true Write .network.value."iucv5".BOOTPROTO "dhcp" true Write .network.value."iucv5".STARTMODE "manual" true Write .network.value."lo".BROADCAST "127.255.255.255" true @@ -137,10 +150,6 @@ Write .network.value."lo".STARTMODE "auto" true Write .network.value."myri5".BOOTPROTO "dhcp" true Write .network.value."myri5".STARTMODE "manual" true -Write .network.value."ppp5".BOOTPROTO "dhcp" true -Write .network.value."ppp5".STARTMODE "manual" true -Write .network.value."tr5".BOOTPROTO "dhcp" true -Write .network.value."tr5".STARTMODE "manual" true Write .network.value."eth0.3".BOOTPROTO "dhcp" true Write .network.value."eth0.3".ETHERDEVICE "eth0" true Write .network.value."eth0.3".STARTMODE "manual" true @@ -156,40 +165,6 @@ Write .network.value."vlan3".STARTMODE "manual" true Write .network nil true Return true -Write .network.value."eth5".BOOTPROTO "dhcp" true -Write .network.value."eth5".STARTMODE "manual" true -Write .network.value."eth6".BOOTPROTO "static" true -Write .network.value."eth6".IPADDR "1.2.3.4/32" true -Write .network.value."eth6".PREFIXLEN "32" true -Write .network.value."eth6".STARTMODE "manual" true -Write .network.value."eth7".STARTMODE "manual" true -Write .network.value."eth8".IPADDR "1.2.3.4/8" true -Write .network.value."eth8".PREFIXLEN "8" true -Write .network.value."eth8".STARTMODE "manual" true -Write .network.value."eth9".IPADDR "1.2.3.4/8" true -Write .network.value."eth9".PREFIXLEN "8" true -Write .network.value."eth9".STARTMODE "manual" true -Write .network.value."mynet0".BOOTPROTO "dhcp" true -Write .network.value."mynet0".INTERFACETYPE "eth" true -Write .network.value."mynet0".STARTMODE "auto" true -Write .network nil true -Return true -Write .network.value."ppp5".BOOTPROTO "dhcp" true -Write .network.value."ppp5".STARTMODE "manual" true -Write .network nil true -Return true -Write .network.value."ippp5".BOOTPROTO "dhcp" true -Write .network.value."ippp5".STARTMODE "manual" true -Write .network nil true -Return true -Write .network nil true -Return true -Write .network.value."atm5".BOOTPROTO "dhcp" true -Write .network.value."atm5".STARTMODE "manual" true -Write .network.value."tr5".BOOTPROTO "dhcp" true -Write .network.value."tr5".STARTMODE "manual" true -Write .network nil true -Return true Dump NetworkInterfaces::Export Dump exported=$["arc":$["arc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "atm":$["atm5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ci":$["ci5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ctc":$["ctc5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "dummy":$["dummy5":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"]], "escon":$["escon5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "eth":$["eth5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"], "eth6":$["BOOTPROTO":"static", "IPADDR":"1.2.3.4", "NETMASK":"255.255.255.255", "PREFIXLEN":"32", "STARTMODE":"manual"], "eth7":$["STARTMODE":"manual"], "eth8":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "eth9":$["IPADDR":"1.2.3.4", "NETMASK":"255.0.0.0", "PREFIXLEN":"8", "STARTMODE":"manual"], "mynet0":$["BOOTPROTO":"dhcp", "INTERFACETYPE":"eth", "STARTMODE":"auto"]], "fddi":$["fddi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hi ppi":$["hippi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "hsi":$["hsi5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ippp":$["ippp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "iucv":$["iucv5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "lo":$["lo":$["BROADCAST":"127.255.255.255", "IPADDR":"127.0.0.1", "NETMASK":"255.0.0.0", "NETWORK":"127.0.0.0", "PREFIXLEN":"8", "STARTMODE":"auto"]], "myri":$["myri5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "ppp":$["ppp5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "tr":$["tr5":$["BOOTPROTO":"dhcp", "STARTMODE":"manual"]], "vlan":$["eth0.3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "myvlantoo":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual", "VLAN_ID":"2"], "virtlan4":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"], "vlan3":$["BOOTPROTO":"dhcp", "ETHERDEVICE":"eth0", "STARTMODE":"manual"]]] Dump NetworkInterfaces::Import Modified: trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp?rev=65480&r1=65479&r2=65480&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/NetworkInterfaces2.ycp Wed Aug 31 16:28:04 2011 @@ -82,12 +82,12 @@ NetworkInterfaces::OriginalDevices = nil; DUMP("NetworkInterfaces::Write"); -TEST(``(NetworkInterfaces::Write("")), [READ], nil); TEST(``(NetworkInterfaces::Write("eth")), [READ], nil); TEST(``(NetworkInterfaces::Write("ppp")), [READ], nil); TEST(``(NetworkInterfaces::Write("ippp")), [READ], nil); TEST(``(NetworkInterfaces::Write("trx")), [READ], nil); TEST(``(NetworkInterfaces::Write("atm|tr")), [READ], nil); +TEST(``(NetworkInterfaces::Write("")), [READ], nil); map exported = nil; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=65480&r1=65479&r2=65480&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Aug 31 16:28:04 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 31 16:21:31 CEST 2011 - mvidner@suse.cz + +- Update Deleted and OriginalDevices in NetworkInterfaces::Write. + Thanks to Justus Winter +- 2.21.14 + +------------------------------------------------------------------- Wed Aug 31 07:40:54 UTC 2011 - lslezak@suse.cz - fixed trusting a GPG key (wrong id check) (bnc#713068) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org