January 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67316 - in /branches/SuSE-Code-11-SP2-Branch/network/src: clients/save_network.ycp modules/LanItems.ycp routines/routines.ycp
by mvidner＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: mvidner Date: Thu Jan 26 18:05:52 2012 New Revision: 67316 URL: http://svn.opensuse.org/viewcvs/yast?rev=67316&view=rev Log: fixed detection of need for persistent mac address (bnc#728611) dev_name or sysfs_id are missing/wrong in the available hwinfo, so construct sysfs_id from busid Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp Thu Jan 26 18:05:52 2012 @@ -142,7 +142,8 @@ if (Arch::s390()) { y2milestone ("Interface type: %1", InstallInf["type"]:""); // only some card types need a persistent MAC (bnc#658708) - if (! s390_device_needs_persistent_mac(netdevice,hardware)) { + string sysfs_id = dev_name_to_sysfs_id(netdevice, hardware); + if (! s390_device_needs_persistent_mac(sysfs_id, hardware)) { InstallInf = remove (InstallInf, "hwaddr"); } // hsi devices do not support setting hwaddr (bnc #479481) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Thu Jan 26 18:05:52 2012 @@ -1065,10 +1065,17 @@ newdev["NETWORK"] = ""; newdev["REMOTE_IPADDR"] = remoteip; + // set LLADDR to sysconfig only for device on layer2 and only these which needs it - if (qeth_layer2 && - s390_device_needs_persistent_mac(Items[current, "ifcfg"]:"",Hardware)){ - newdev["LLADDR"] = qeth_macaddress; + if (qeth_layer2) { + string busid = Items[current, "hwinfo", "busid"]:""; + // string sysfs_id = busid_to_sysfs_id(busid, Hardware); + // sysfs id has changed from css0... + string sysfs_id = "/devices/qeth/" + busid; + y2milestone("busid %1", busid); + if (s390_device_needs_persistent_mac(sysfs_id, Hardware)) { + newdev["LLADDR"] = qeth_macaddress; + } } if(alias == "") { Modified: branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Thu Jan 26 18:05:52 2012 @@ -354,22 +354,27 @@ return need; } +string busid_to_sysfs_id(string busid, list<map> hardware) { + // hardware is cached list of netcards + map hw_item = find(map i, hardware, ``( i["busid"]:"" == busid )); + return hw_item["sysfs_id"]:""; +} + string dev_name_to_sysfs_id(string dev_name, list<map> hardware) { // hardware is cached list of netcards map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name )); return hw_item["sysfs_id"]:""; } -string sysfs_card_type(string device,list<map> hardware) { - string sysfs_id = dev_name_to_sysfs_id(device,hardware); +string sysfs_card_type(string sysfs_id, list<map> hardware) { if (sysfs_id == "") return "none"; string filename = "/sys" + sysfs_id + "/card_type"; string card_type = (string) SCR::Read(.target.string, filename); return String::FirstChunk(card_type, "\n"); } -boolean s390_device_needs_persistent_mac(string device,list<map> hardware) { - string card_type = sysfs_card_type(device,hardware); +boolean s390_device_needs_persistent_mac(string sysfs_id,list<map> hardware) { + string card_type = sysfs_card_type(sysfs_id,hardware); list<string> types_needing_persistent = [ "OSD_100", "OSD_1000", @@ -379,7 +384,7 @@ "OSD_Express", ]; boolean needs_persistent = contains(types_needing_persistent, card_type); - y2milestone("Device: %1, card type: %2, needs persistent MAC: %3", device, card_type, needs_persistent); + y2milestone("Sysfs Device: %1, card type: %2, needs persistent MAC: %3", sysfs_id, card_type, needs_persistent); return needs_persistent; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67315 - /branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp
by jreidinger＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: jreidinger Date: Thu Jan 26 16:45:54 2012 New Revision: 67315 URL: http://svn.opensuse.org/viewcvs/yast?rev=67315&view=rev Log: write LLADDR only for device on layer2 that needs persistent mac address (bnc#728611) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Thu Jan 26 16:45:54 2012 @@ -1065,7 +1065,11 @@ newdev["NETWORK"] = ""; newdev["REMOTE_IPADDR"] = remoteip; - if (qeth_layer2) newdev["LLADDR"] = qeth_macaddress; + // set LLADDR to sysconfig only for device on layer2 and only these which needs it + if (qeth_layer2 && + s390_device_needs_persistent_mac(Items[current, "ifcfg"]:"",Hardware)){ + newdev["LLADDR"] = qeth_macaddress; + } if(alias == "") { newdev["MTU"] = mtu; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67314 - in /branches/SuSE-Code-11-SP2-Branch/network/src: clients/save_network.ycp routines/routines.ycp
by jreidinger＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: jreidinger Date: Thu Jan 26 16:24:13 2012 New Revision: 67314 URL: http://svn.opensuse.org/viewcvs/yast?rev=67314&view=rev Log: and pass also hardware caching (time to celebrate ruby modules) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp Thu Jan 26 16:24:13 2012 @@ -142,7 +142,7 @@ if (Arch::s390()) { y2milestone ("Interface type: %1", InstallInf["type"]:""); // only some card types need a persistent MAC (bnc#658708) - if (! s390_device_needs_persistent_mac(netdevice)) { + if (! s390_device_needs_persistent_mac(netdevice,hardware)) { InstallInf = remove (InstallInf, "hwaddr"); } // hsi devices do not support setting hwaddr (bnc #479481) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Thu Jan 26 16:24:13 2012 @@ -354,22 +354,22 @@ return need; } -string dev_name_to_sysfs_id(string dev_name) { - // hardware is global, read at client start +string dev_name_to_sysfs_id(string dev_name, list<map> hardware) { + // hardware is cached list of netcards map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name )); return hw_item["sysfs_id"]:""; } -string sysfs_card_type(string device) { - string sysfs_id = dev_name_to_sysfs_id(device); +string sysfs_card_type(string device,list<map> hardware) { + string sysfs_id = dev_name_to_sysfs_id(device,hardware); if (sysfs_id == "") return "none"; string filename = "/sys" + sysfs_id + "/card_type"; string card_type = (string) SCR::Read(.target.string, filename); return String::FirstChunk(card_type, "\n"); } -boolean s390_device_needs_persistent_mac(string device) { - string card_type = sysfs_card_type(device); +boolean s390_device_needs_persistent_mac(string device,list<map> hardware) { + string card_type = sysfs_card_type(device,hardware); list<string> types_needing_persistent = [ "OSD_100", "OSD_1000", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67313 - in /branches/SuSE-Code-11-SP2-Branch/network/src: clients/save_network.ycp routines/routines.ycp
by jreidinger＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: jreidinger Date: Thu Jan 26 16:19:46 2012 New Revision: 67313 URL: http://svn.opensuse.org/viewcvs/yast?rev=67313&view=rev Log: move test routine for required persistent MAC for s390 devices (way to fix bnc#728611) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/save_network.ycp Thu Jan 26 16:19:46 2012 @@ -63,35 +63,6 @@ return (ret == nil)? s: ret; } -string dev_name_to_sysfs_id(string dev_name) { - // hardware is global, read at client start - map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name )); - return hw_item["sysfs_id"]:""; -} - -string sysfs_card_type(string device) { - string sysfs_id = dev_name_to_sysfs_id(device); - if (sysfs_id == "") return "none"; - string filename = "/sys" + sysfs_id + "/card_type"; - string card_type = (string) SCR::Read(.target.string, filename); - return String::FirstChunk(card_type, "\n"); -} - -boolean s390_device_needs_persistent_mac(string device) { - string card_type = sysfs_card_type(device); - list<string> types_needing_persistent = [ - "OSD_100", - "OSD_1000", - "OSD_10GIG", - "OSD_FE_LANE", - "OSD_GbE_LANE", - "OSD_Express", - ]; - boolean needs_persistent = contains(types_needing_persistent, card_type); - y2milestone("Device: %1, card type: %2, needs persistent MAC: %3", device, card_type, needs_persistent); - return needs_persistent; -} - /** * Read install.inf from the correct location * @return true on success Modified: branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/routines/routines.ycp Thu Jan 26 16:19:46 2012 @@ -354,6 +354,36 @@ return need; } +string dev_name_to_sysfs_id(string dev_name) { + // hardware is global, read at client start + map hw_item = find(map i, hardware, ``( i["dev_name"]:"" == dev_name )); + return hw_item["sysfs_id"]:""; +} + +string sysfs_card_type(string device) { + string sysfs_id = dev_name_to_sysfs_id(device); + if (sysfs_id == "") return "none"; + string filename = "/sys" + sysfs_id + "/card_type"; + string card_type = (string) SCR::Read(.target.string, filename); + return String::FirstChunk(card_type, "\n"); +} + +boolean s390_device_needs_persistent_mac(string device) { + string card_type = sysfs_card_type(device); + list<string> types_needing_persistent = [ + "OSD_100", + "OSD_1000", + "OSD_10GIG", + "OSD_FE_LANE", + "OSD_GbE_LANE", + "OSD_Express", + ]; + boolean needs_persistent = contains(types_needing_persistent, card_type); + y2milestone("Device: %1, card type: %2, needs persistent MAC: %3", device, card_type, needs_persistent); + return needs_persistent; +} + + /* map<string, any> getcfg(string options, string device){ map <string, any> cfg=$[]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67312 - in /branches/SuSE-Code-11-SP2-Branch/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: mvidner Date: Thu Jan 26 16:15:52 2012 New Revision: 67312 URL: http://svn.opensuse.org/viewcvs/yast?rev=67312&view=rev Log: Ensure persistent interface names by retriggering udev events after we have written an incomplete 70-persistent-net.rules (bnc#721520). Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Thu Jan 26 16:15:52 2012 @@ -1 +1 @@ -2.17.169 +2.17.170 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Thu Jan 26 16:15:52 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 26 16:05:05 CET 2012 - mvidner(a)suse.cz + +- Ensure persistent interface names by retriggering udev events + after we have written an incomplete 70-persistent-net.rules + (bnc#721520). +- 2.17.170 + +------------------------------------------------------------------- Wed Jan 25 13:22:14 CET 2012 - mvidner(a)suse.cz - Filter out the last Chelsio device (bnc#711432#c88). Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Thu Jan 26 16:15:52 2012 @@ -251,6 +251,12 @@ }); SCR::Write(.udev_persistent.rules, net_rules); SCR::Write(.udev_persistent.nil, []); + // When configuring a new s390 card, we neglect to fill + // its Items[i, "udev", "net"], causing jumbled names (bnc#721520) + // The udev trigger will will make udev write the persistent names + // (which it already has done, but we have overwritten them now). + SCR::Execute(.target.bash, "udevadm trigger --subsystem-match=net"); + y2milestone("Changed devices %1", changed_devices); if (size(changed_devices)>0) { string cmd = "rcnetwork stop && udevadm trigger --subsystem-match=net && rcnetwork start"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67311 - /branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: mvidner Date: Thu Jan 26 16:15:48 2012 New Revision: 67311 URL: http://svn.opensuse.org/viewcvs/yast?rev=67311&view=rev Log: Reindented. Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Thu Jan 26 16:15:48 2012 @@ -223,47 +223,51 @@ } global void WriteUdevDriverRules(){ - map<string, any> udev_drivers_rules = $[]; - foreach(integer key, (list<integer>)Map::Keys(Items), { - string driver = Items[key, "udev", "driver"]:""; - if (hasAnyValue(driver)) - udev_drivers_rules[driver] = [ - sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), - sformat("ENV{MODALIAS}=\"%1\"", driver) - ]; - }); - y2milestone("write udev rules: %1", udev_drivers_rules); - SCR::Write(.udev_persistent.drivers, udev_drivers_rules); - // write udev net rules and hwdown&hwup when NAME changed - list<string> changed_devices = []; - list<string> net_rules = []; - foreach(integer key, (list<integer>)Map::Keys(Items), { - if (size(Items[key, "udev", "net"]:[])>0) { - string dev_name = Items[key, "hwinfo", "dev_name"]:""; - current=key; - net_rules = add(net_rules, mergestring(Items[key, "udev", "net"]:[], ", ")); - if (dev_name!=GetItemUdev("NAME")) { - changed_devices = add(changed_devices, dev_name); - force_restart=true; - } - } - }); - SCR::Write(.udev_persistent.rules, net_rules); - SCR::Write(.udev_persistent.nil, []); - y2milestone("Changed devices %1", changed_devices); - if (size(changed_devices)>0) y2milestone("Renaming interfaces %1", SCR::Execute(.target.bash_output, "rcnetwork stop && udevadm trigger --subsystem-match=net && rcnetwork start")); + map<string, any> udev_drivers_rules = $[]; + foreach(integer key, (list<integer>)Map::Keys(Items), { + string driver = Items[key, "udev", "driver"]:""; + if (hasAnyValue(driver)) { + udev_drivers_rules[driver] = [ + sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), + sformat("ENV{MODALIAS}=\"%1\"", driver) + ]; + } + }); + y2milestone("write udev rules: %1", udev_drivers_rules); + SCR::Write(.udev_persistent.drivers, udev_drivers_rules); + // write udev net rules and hwdown&hwup when NAME changed + list<string> changed_devices = []; + list<string> net_rules = []; + foreach(integer key, (list<integer>)Map::Keys(Items), { + if (size(Items[key, "udev", "net"]:[])>0) { + string dev_name = Items[key, "hwinfo", "dev_name"]:""; + current=key; + net_rules = add(net_rules, mergestring(Items[key, "udev", "net"]:[], ", ")); + if (dev_name!=GetItemUdev("NAME")) { + changed_devices = add(changed_devices, dev_name); + force_restart=true; + } + } + }); + SCR::Write(.udev_persistent.rules, net_rules); + SCR::Write(.udev_persistent.nil, []); + y2milestone("Changed devices %1", changed_devices); + if (size(changed_devices)>0) { + string cmd = "rcnetwork stop && udevadm trigger --subsystem-match=net && rcnetwork start"; + y2milestone("Renaming interfaces %1", SCR::Execute(.target.bash_output, cmd)); + } - // write rules from driver - foreach(string key, string value, (map<string, string>)driver_options, { - map val=$[]; - foreach(string k, splitstring(value, " "), { - list<string> l = splitstring(k, "="); - val[ l[0]:"" ]=l[1]:""; - }); - if (!hasAnyValue(value)) val=nil; - SCR::Write(add(.modules.options, key), val); - }); - SCR::Write(.modules,nil); + // write rules from driver + foreach(string key, string value, (map<string, string>)driver_options, { + map val=$[]; + foreach(string k, splitstring(value, " "), { + list<string> l = splitstring(k, "="); + val[ l[0]:"" ]=l[1]:""; + }); + if (!hasAnyValue(value)) val=nil; + SCR::Write(add(.modules.options, key), val); + }); + SCR::Write(.modules,nil); } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67310 - /branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: mvidner Date: Thu Jan 26 16:15:45 2012 New Revision: 67310 URL: http://svn.opensuse.org/viewcvs/yast?rev=67310&view=rev Log: small reformatting Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Thu Jan 26 16:15:45 2012 @@ -225,8 +225,12 @@ global void WriteUdevDriverRules(){ map<string, any> udev_drivers_rules = $[]; foreach(integer key, (list<integer>)Map::Keys(Items), { - if (hasAnyValue(Items[key, "udev", "driver"]:"")) - udev_drivers_rules[Items[key, "udev", "driver"]:""] = [ sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), sformat("ENV{MODALIAS}=\"%1\"", Items[key, "udev", "driver"]:"") ]; + string driver = Items[key, "udev", "driver"]:""; + if (hasAnyValue(driver)) + udev_drivers_rules[driver] = [ + sformat("ENV{MODALIAS}==\"%1\"", Items[key, "hwinfo", "modalias"]:""), + sformat("ENV{MODALIAS}=\"%1\"", driver) + ]; }); y2milestone("write udev rules: %1", udev_drivers_rules); SCR::Write(.udev_persistent.drivers, udev_drivers_rules); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67309 - /tags/branch-Code-11-SP1-2_17_45_5/pkg-bindings/
by lslezak＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: lslezak Date: Thu Jan 26 15:24:33 2012 New Revision: 67309 URL: http://svn.opensuse.org/viewcvs/yast?rev=67309&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_5 for pkg-bindings Added: tags/branch-Code-11-SP1-2_17_45_5/pkg-bindings/ (props changed) - copied from r67308, branches/SuSE-Code-11-SP1-Branch/pkg-bindings/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67308 - /tags/branch-Code-11-SP1-2_17_45_5/
by lslezak＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: lslezak Date: Thu Jan 26 15:24:30 2012 New Revision: 67308 URL: http://svn.opensuse.org/viewcvs/yast?rev=67308&view=rev Log: Created tag branch-Code-11-SP1-2_17_45_5 Added: tags/branch-Code-11-SP1-2_17_45_5/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67307 - in /branches/SuSE-Code-11-SP1-Branch/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Service.cc src/Source_Create.cc src/Source_Save.cc src/YRepo.cc src/YRepo.h
by lslezak＠svn2.opensuse.org 26 Jan '12

26 Jan '12

Author: lslezak Date: Thu Jan 26 15:24:26 2012 New Revision: 67307 URL: http://svn.opensuse.org/viewcvs/yast?rev=67307&view=rev Log: - fixed saving additional repositories added by registration (a regression introduced by bnc#724449 fix) (bnc#742033) - 2.17.45.5 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Service.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Create.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.cc branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.h Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/VERSION Thu Jan 26 15:24:26 2012 @@ -1 +1 @@ -2.17.45.4 +2.17.45.5 Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/package/yast2-pkg-bindings.changes Thu Jan 26 15:24:26 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 26 11:50:25 UTC 2012 - lslezak(a)suse.cz + +- fixed saving additional repositories added by registration + (a regression introduced by bnc#724449 fix) (bnc#742033) +- 2.17.45.5 + +------------------------------------------------------------------- Tue Dec 6 13:29:53 UTC 2011 - lslezak(a)suse.cz - fixed reloading of repositories which have been removed during Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Service.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Service.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Service.cc Thu Jan 26 15:24:26 2012 @@ -394,7 +394,8 @@ { repos[idx]->repoInfo() = repomanager.getRepositoryInfo(info.alias()); } - else + // do not remove repos which have not been saved yet (freshly added) + else if (!repo->isAdded()) { y2milestone("Repository %s has been removed, unloading it", (info.alias().c_str())); RemoveResolvablesFrom(info.alias()); Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Create.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Create.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Create.cc Thu Jan 26 15:24:26 2012 @@ -314,7 +314,11 @@ prg.toMax(); } - repos.push_back(new YRepo(repo)); + + YRepo_Ptr new_repo = new YRepo(repo); + new_repo->setAdded(); + + repos.push_back(new_repo); y2milestone("Added source '%s': '%s', enabled: %s, autorefresh: %s", repo.alias().c_str(), @@ -511,7 +515,10 @@ repo.setPackagesPath(repomanager.packagesPath(repo)); - repos.push_back(new YRepo(repo)); + YRepo_Ptr new_repo = new YRepo(repo); + new_repo->setAdded(); + + repos.push_back(new_repo); // the new source is at the end of the list return YCPInteger(repos.size() - 1); Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/Source_Save.cc Thu Jan 26 15:24:26 2012 @@ -220,6 +220,12 @@ y2milestone("Adding repository '%s'", current_alias.c_str()); repomanager.addRepository((*it)->repoInfo()); } + + if (!(*it)->isAdded()) + { + y2milestone("Resetting added flag for repository %s", current_alias.c_str()); + (*it)->resetAdded(); + } } catch (zypp::Exception & excpt) { Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.cc Thu Jan 26 15:24:26 2012 @@ -32,7 +32,7 @@ IMPL_PTR_TYPE(YRepo); YRepo::YRepo(zypp::RepoInfo & repo) - : _repo(repo), _deleted(false) + : _repo(repo), _deleted(false), _added(false) {} YRepo::~YRepo() Modified: branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/pkg-b… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/pkg-bindings/src/YRepo.h Thu Jan 26 15:24:26 2012 @@ -39,6 +39,7 @@ zypp::RepoInfo _repo; zypp::MediaSetAccess_Ptr _maccess; bool _deleted; + bool _added; YRepo() {} @@ -53,6 +54,10 @@ bool isDeleted() {return _deleted;} void setDeleted() {_deleted = true;} + bool isAdded() {return _added;} + void setAdded() {_added = true;} + void resetAdded() {_added = false;} + public: static const YRepo NOREPO; }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0