- YaST Commits

[yast-commit] r38353 - /trunk/ncurses/POTFILES
by kmachalkova＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: kmachalkova Date: Thu Jun 7 18:08:24 2007 New Revision: 38353 URL: http://svn.opensuse.org/viewcvs/yast?rev=38353&view=rev Log: src/pkg/NCPkgTable.cc -> src/NCPkgTable.cc Modified: trunk/ncurses/POTFILES Modified: trunk/ncurses/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/POTFILES?rev=38353&r1=38… ============================================================================== --- trunk/ncurses/POTFILES (original) +++ trunk/ncurses/POTFILES Thu Jun 7 18:08:24 2007 @@ -4,7 +4,7 @@ ./src/NCurses.cc ./src/NCDialog.cc ./src/NCPopupInfo.h -./src/pkg/NCPkgTable.cc +./src/NCPkgTable.cc ./src/pkg/pkg_layout.ycp ./src/pkg/NCPkgPopupDiskspace.cc ./src/pkg/NCPkgNames.cc -- 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] r38352 - /tags/stable-2_15_18/ncurses/
by kmachalkova＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: kmachalkova Date: Thu Jun 7 18:04:17 2007 New Revision: 38352 URL: http://svn.opensuse.org/viewcvs/yast?rev=38352&view=rev Log: Created tag stable-2_15_18 for ncurses Added: tags/stable-2_15_18/ncurses/ - copied from r38351, trunk/ncurses/ -- 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] r38351 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes src/NCCheckBoxFrame.cc
by kmachalkova＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: kmachalkova Date: Thu Jun 7 17:53:20 2007 New Revision: 38351 URL: http://svn.opensuse.org/viewcvs/yast?rev=38351&view=rev Log: Do not add extra vertical space to CheckBoxFrame widget (expand only horizontally so that check box fits in) Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCCheckBoxFrame.cc Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=38351&r1=383… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Thu Jun 7 17:53:20 2007 @@ -1 +1 @@ -2.15.17 +2.15.18 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Thu Jun 7 17:53:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 7 17:48:20 CEST 2007 - kmachalkova(a)suse.cz + +- Do not add extra vertical space to CheckBoxFrame widget (expand + only horizontally so that check box fits in) +- 2.15.18 + +------------------------------------------------------------------- Wed Jun 6 13:18:39 CEST 2007 - gs(a)suse.de - Online Update/Package Installation: allow status change and show Modified: trunk/ncurses/src/NCCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCCheckBoxFrame.cc?r… ============================================================================== --- trunk/ncurses/src/NCCheckBoxFrame.cc (original) +++ trunk/ncurses/src/NCCheckBoxFrame.cc Thu Jun 7 17:53:20 2007 @@ -72,11 +72,14 @@ // long NCCheckBoxFrame::nicesize( YUIDimension dim ) { + //space to add - keep vertical dim, add horizontal space + //for checkbox + wpair plussize = wpair(0,4); defsze = wsze( YContainerWidget::child(0)->nicesize( YD_VERT ), YContainerWidget::child(0)->nicesize( YD_HORIZ ) ); if ( label.width() > (unsigned)defsze.W ) defsze.W = label.width(); - defsze += framedim.Sze + 4; // add space for check box + defsze += framedim.Sze + plussize; return dim == YD_HORIZ ? defsze.W : defsze.H; } -- 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] r38350 - /tags/stable-2_15_41/network/
by mzugec＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: mzugec Date: Thu Jun 7 17:46:34 2007 New Revision: 38350 URL: http://svn.opensuse.org/viewcvs/yast?rev=38350&view=rev Log: Created tag stable-2_15_41 for network Added: tags/stable-2_15_41/network/ - copied from r38349, trunk/network/ -- 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] r38349 - in /trunk/network: ./ package/ src/clients/ src/lan/ src/modules/ src/routines/
by mzugec＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: mzugec Date: Thu Jun 7 17:46:23 2007 New Revision: 38349 URL: http://svn.opensuse.org/viewcvs/yast?rev=38349&view=rev Log: use static keyword for ISA/pnp devices hardware filenames (#208854) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/lan/address.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/routines/hardware.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=38349&r1=383… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Jun 7 17:46:23 2007 @@ -1 +1 @@ -2.15.40 +2.15.41 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jun 7 17:46:23 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 17:45:24 CEST 2007 - mzugec(a)suse.cz + +- use static keyword for ISA/pnp devices hardware filenames (#208854) +- 2.15.41 + +------------------------------------------------------------------- Wed Jun 6 16:31:35 CEST 2007 - mzugec(a)suse.cz - values proposal for hardware dialog Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Thu Jun 7 17:46:23 2007 @@ -203,8 +203,15 @@ hwfile = sformat("static-0"); y2warning("vio bus type, using %1", hwfile); } else { - hwfile = sformat("bus-%1-%2", busname, busid); + // #208854 - include "static" string for ISA cards + if (busname=="isa") + { + hwfile = sformat("static-bus-%1-%2", busname, busid); y2internal("will create hwcfg file %1", hwfile); + } else { + hwfile = sformat("bus-%1-%2", busname, busid); + y2internal("will create hwcfg file %1", hwfile); + } } } else { Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Thu Jun 7 17:46:23 2007 @@ -615,7 +615,7 @@ - string drvtype = Lan::DriverType (settings["IFCFGTYPE"]:""); + string drvtype = DriverType (settings["IFCFGTYPE"]:""); boolean is_ptp = drvtype == "ctc" || drvtype == "iucv"; // TODO: dynamic for dummy. or add dummy from outside? Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev… ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Thu Jun 7 17:46:23 2007 @@ -20,6 +20,7 @@ import "Wizard"; include "network/summary.ycp"; +include "network/routines.ycp"; /** * Manual network card configuration dialog @@ -90,7 +91,7 @@ // #38213, remember device id when we switch back from pcmcia/usb hardware["non_hotplug_device_id"] = hardware["device"]:""; hardware["hwcfg"] = Lan::nm_name; - if (size(Lan::nm_name)==0 && size(Lan::nm_name_old)>0) hardware["hwcfg"]=Lan::nm_name_old; + if (!hasAnyValue(Lan::nm_name) && hasAnyValue(Lan::nm_name_old)) hardware["hwcfg"]=Lan::nm_name_old; // FIXME duplicated in address.ycp hardware["device_types"] = [ "arc", "bnep", "dummy", "eth", "fddi", "myri", "tr", "usb", "wlan", "bond" ]; @@ -221,7 +222,7 @@ UI::ReplaceWidget(`hw_content, contents); -if (size(Lan::nm_name)==0 && size(Lan::nm_name_old)>0) UI::ChangeWidget(`enable_hwcfg, `Value, false); +if (!hasAnyValue(Lan::nm_name) && hasAnyValue(Lan::nm_name_old)) UI::ChangeWidget(`enable_hwcfg, `Value, false); hardware["no_hotplug"] = hardware["hotplug"]:"" == ""; hardware["no_hotplug_dummy"] = hardware["no_hotplug"]:false && hardware["type"]:"" != "dummy"; UI::ChangeWidget(`id(`modul), `Enabled, hardware["no_hotplug_dummy"]:false); @@ -382,7 +383,7 @@ UI::ChangeWidget(`id(`num), `Value, hardware["device"]:""); if(Arch::s390 ()) { - string drvtype = Lan::DriverType (hardware["type"]:""); + string drvtype = DriverType (hardware["type"]:""); if (contains (["lcs", "qeth", "ctc"], drvtype)) hardware["modul"] = drvtype; @@ -498,7 +499,7 @@ /* S/390 dialog caption */ string caption = _("S/390 Network Card Configuration"); - string drvtype = Lan::DriverType (Lan::type); + string drvtype = DriverType (Lan::type); string helptext = ""; term contents = `Empty (); Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Jun 7 17:46:23 2007 @@ -292,6 +292,7 @@ */ global list<string> getModulesFor(string busid, string default_module){ + if (!hasAnyValue(busid)) return []; string bus_id = substring(busid, findfirstof(busid, "0123456789")); list<string> mods = [ default_module ]; foreach(map<string, any> mod_row, (list<map<string, any> >)Hardware, { @@ -311,26 +312,6 @@ include "network/routines.ycp"; include "network/runtime.ycp"; -/** - * For s390 hwinfo gives us a multitude of types but some are handled - * the same, mostly acording to the driver which is used. So let's group - * them under the name Driver Type. - * @param type a type, as in Lan::type - * @return driver type, like formerly type2 for s390 - */ -global define string DriverType (string type) { - string drvtype = type; - // handle HSI like qeth, S#40692#c15 - if (type == "hsi") - drvtype = "qeth"; - // Should eth occur on s390? - else if (type == "tr" || type == "eth") - drvtype = "lcs"; - // N#82891 - else if (type == "escon" || type == "ficon") - drvtype = "ctc"; - return drvtype; -} /** * Lan::Read (`cache) will do nothing if initialized already. @@ -717,19 +698,7 @@ string mac = hw["mac"]:""; string busid = hw["busid"]:""; - // name of hwcfg - if(busid != nil && busid != "") { - nm_name = "bus-" + hw["bus"]:"" + "-" + hw["busid"]:""; - if(Arch::s390 ()) nm_name = type + "-" + nm_name; - } - else { - // #suse42421 - don't write hwcfg-static for pcmcia cards (PC and CardBus) - // #254753 - when busID not available, use static-x hwcfg filename - if(Arch::s390 ()) { - nm_name = NetworkModules::GetFreeName("static-"); - y2internal("No bus id info found, will use %1", nm_name); - } else y2warning ("No bus id info found, skipping hwcfg: %1", hw); - } + nm_name = createHwcfgName(hw); // name of ifcfg /* eth, tr, not on s390 (#38819) */ Modified: trunk/network/src/routines/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/hardware.yc… ============================================================================== --- trunk/network/src/routines/hardware.ycp (original) +++ trunk/network/src/routines/hardware.ycp Thu Jun 7 17:46:23 2007 @@ -234,6 +234,7 @@ one["name"] = DeviceName(card); one["type"] = controller; one["udi"] = card["udi"]:""; + one["sysfs_id"] = card["sysfs_id"]:""; one["requires"] = card["requires"]:[]; // Each card remembers its position in the list of _all_ cards. // It is used when selecting the card from the list of _unconfigured_ @@ -470,5 +471,34 @@ return SelectHardwareMap (FindHardware (Hardware, which)); } + +import "NetworkModules"; +include "network/routines.ycp"; + +string createHwcfgName(map hw){ + string hwcfg_name = ""; + // name of hwcfg + if(hasAnyValue(hw["busid"]:"")) { + // #208854 - include "static" string + if(issubstring(hw["sysfs_id"]:"", "pnp")){ + hwcfg_name = "static-bus-" + hw["bus"]:"" + "-" + hw["busid"]:""; + } + else{ + hwcfg_name = "bus-" + hw["bus"]:"" + "-" + hw["busid"]:""; + if(Arch::s390 ()) hwcfg_name = DriverType(type) + "-" + hwcfg_name; + } + } + else { + // #suse42421 - don't write hwcfg-static for pcmcia cards (PC and CardBus) + // #254753 - when busID not available, use static-x hwcfg filename + if(Arch::s390 ()) { + hwcfg_name = NetworkModules::GetFreeName("static-"); + y2internal("No bus id info found, will use %1", hwcfg_name); + } else y2warning ("No bus id info found, skipping hwcfg: %1", hw); + } + return hwcfg_name; +} + + /* EOF */ } Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.yc… ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Thu Jun 7 17:46:23 2007 @@ -299,5 +299,33 @@ return `next; } +/** + * For s390 hwinfo gives us a multitude of types but some are handled + * the same, mostly acording to the driver which is used. So let's group + * them under the name Driver Type. + * @param type a type, as in Lan::type + * @return driver type, like formerly type2 for s390 + */ +define string DriverType (string type) { + string drvtype = type; + // handle HSI like qeth, S#40692#c15 + if (type == "hsi") + drvtype = "qeth"; + // Should eth occur on s390? + else if (type == "tr" || type == "eth") + drvtype = "lcs"; + // N#82891 + else if (type == "escon" || type == "ficon") + drvtype = "ctc"; + return drvtype; +} + +boolean hasAnyValue(string value){ + if (value==nil) return false; + if (size(value)==0) return false; + else return true; +} + + /* EOF */ } -- 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] r38348 - /trunk/ncurses/yast2-ncurses.spec.in
by kmachalkova＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: kmachalkova Date: Thu Jun 7 16:37:38 2007 New Revision: 38348 URL: http://svn.opensuse.org/viewcvs/yast?rev=38348&view=rev Log: Adjusted specfile to require y2-core >=2.15.6 (UI plugins) Modified: trunk/ncurses/yast2-ncurses.spec.in Modified: trunk/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/yast2-ncurses.spec.in?re… ============================================================================== --- trunk/ncurses/yast2-ncurses.spec.in (original) +++ trunk/ncurses/yast2-ncurses.spec.in Thu Jun 7 16:37:38 2007 @@ -19,8 +19,8 @@ Requires: glibc-locale #Resolver::verifySystem Requires: libzypp >= 2.12.1 -# UI builtins (CheckBoxFrame) -Requires: yast2-core >= 2.15.2 +#UI plugins - YPackageSelectorPlugin.h +Requires: yast2-core >= 2.15.6 %description - -- 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] r38347 - /tags/stable-2_15_10/ldap-client/
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 16:28:22 2007 New Revision: 38347 URL: http://svn.opensuse.org/viewcvs/yast?rev=38347&view=rev Log: Created tag stable-2_15_10 for ldap-client Added: tags/stable-2_15_10/ldap-client/ - copied from r38346, trunk/ldap-client/ -- 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] r38346 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: jsuchome Date: Thu Jun 7 16:28:16 2007 New Revision: 38346 URL: http://svn.opensuse.org/viewcvs/yast?rev=38346&view=rev Log: - fix dialog layout for ncurses mode (#280398) - 2.15.10 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=38346&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Jun 7 16:28:16 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Jun 7 16:28:16 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 16:20:56 CEST 2007 - jsuchome(a)suse.cz + +- fix dialog layout for ncurses mode (#280398) +- 2.15.10 + +------------------------------------------------------------------- Mon Jun 4 15:44:16 CEST 2007 - jsuchome(a)suse.cz - call LDAPInitWithTLSCheck at one more place (#246397) Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=38346… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Jun 7 16:28:16 2007 @@ -699,7 +699,7 @@ define void set_client_term () { term cont = `Top (`HBox(`HSpacing (5), `VBox( - `VSpacing(3), + `VSpacing(), // frame label `Frame (_("Naming Contexts"), `HBox( `HSpacing (1), `VBox( @@ -767,7 +767,7 @@ `PushButton (`id(`br), `opt(`key_F6), _("Bro&wse")) ) ), - `VSpacing(0.5), + `VSpacing(0.4), `HBox ( // textentry label `TextEntry (`id (`bind_dn), _("Administrator &DN"), bind_dn), @@ -781,7 +781,7 @@ `Left (`CheckBox (`id(`create_ldap), // checkbox label _("Crea&te Default Configuration Objects"), create_ldap)), - `VSpacing(0.5), + `VSpacing(0.4), `Left (`CheckBox (`id(`file_server), // checkbox label _("&Home Directories on This Machine"), @@ -791,7 +791,7 @@ `Right (`PushButton (`id(`configure), // pushbutton label _("Configure User Management &Settings..."))), - `VSpacing (2), + `VSpacing (), `Table (`id (`ppolicy_table), `opt(`notify), `header ( // table header _("Password Policy")), @@ -803,7 +803,7 @@ `PushButton (`id (`delete), Label::DeleteButton ()), `HStretch () ), - `VSpacing(0.5) + `VSpacing(0.4) ), `HSpacing (5)); UI::ReplaceWidget (`tabContents, cont); -- 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] r38345 - /tags/branch-SLE-10-SP2-2_13_194/installation/
by locilka＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: locilka Date: Thu Jun 7 16:27:16 2007 New Revision: 38345 URL: http://svn.opensuse.org/viewcvs/yast?rev=38345&view=rev Log: Created tag branch-SLE-10-SP2-2_13_194 for installation Added: tags/branch-SLE-10-SP2-2_13_194/installation/ - copied from r38344, branches/SuSE-SLE-10-SP2-Branch/installation/ -- 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] r38344 - /tags/branch-SLE-10-SP2-2_13_194/
by locilka＠svn.opensuse.org 07 Jun '07

07 Jun '07

Author: locilka Date: Thu Jun 7 16:27:15 2007 New Revision: 38344 URL: http://svn.opensuse.org/viewcvs/yast?rev=38344&view=rev Log: Created tag branch-SLE-10-SP2-2_13_194 Added: tags/branch-SLE-10-SP2-2_13_194/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0