January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55065 - /tags/branch-Code-11-2_17_1/s390/
by mzugec＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: mzugec Date: Tue Jan 27 12:26:14 2009 New Revision: 55065 URL: http://svn.opensuse.org/viewcvs/yast?rev=55065&view=rev Log: Created tag branch-Code-11-2_17_1 for s390 Added: tags/branch-Code-11-2_17_1/s390/ - copied from r55064, branches/SuSE-Code-11-Branch/s390/ -- 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] r55064 - in /branches/SuSE-Code-11-Branch/s390: VERSION package/yast2-s390.changes src/modules/DASDController.ycp
by mzugec＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: mzugec Date: Tue Jan 27 12:26:03 2009 New Revision: 55064 URL: http://svn.opensuse.org/viewcvs/yast?rev=55064&view=rev Log: descriptions for return values (bnc#446998) Modified: branches/SuSE-Code-11-Branch/s390/VERSION branches/SuSE-Code-11-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-Branch/s390/src/modules/DASDController.ycp Modified: branches/SuSE-Code-11-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/s390/VERS… ============================================================================== --- branches/SuSE-Code-11-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-Branch/s390/VERSION Tue Jan 27 12:26:03 2009 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: branches/SuSE-Code-11-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/s390/pack… ============================================================================== --- branches/SuSE-Code-11-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-Branch/s390/package/yast2-s390.changes Tue Jan 27 12:26:03 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 12:25:41 CET 2009 - mzugec(a)suse.cz + +- descriptions for return values (bnc#446998) +- 2.17.1 + +------------------------------------------------------------------- Thu Oct 16 02:37:46 CEST 2008 - ro(a)suse.de - temporary workaround for yast2-schema: Modified: branches/SuSE-Code-11-Branch/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/s390/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/s390/src/modules/DASDController.ycp (original) +++ branches/SuSE-Code-11-Branch/s390/src/modules/DASDController.ycp Tue Jan 27 12:26:03 2009 @@ -388,6 +388,16 @@ Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not change state of the device"), id)); + else if (ret == 5) + // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: device is not a DASD"), id)); + else if (ret == 6) + // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: Could not load module"), id)); else Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code -- 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] r55063 - /tags/stable-2_18_0/s390/
by mzugec＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: mzugec Date: Tue Jan 27 12:23:41 2009 New Revision: 55063 URL: http://svn.opensuse.org/viewcvs/yast?rev=55063&view=rev Log: Created tag stable-2_18_0 for s390 Added: tags/stable-2_18_0/s390/ - copied from r55062, trunk/s390/ -- 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] r55062 - in /trunk/s390: VERSION package/yast2-s390.changes src/modules/DASDController.ycp
by mzugec＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: mzugec Date: Tue Jan 27 12:23:34 2009 New Revision: 55062 URL: http://svn.opensuse.org/viewcvs/yast?rev=55062&view=rev Log: descriptions for return values (bnc#446998) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=55062&r1=55061&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Tue Jan 27 12:23:34 2009 @@ -1 +1 @@ -2.17.0 +2.18.0 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Tue Jan 27 12:23:34 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 12:20:16 CET 2009 - mzugec(a)suse.cz + +- descriptions for return values (bnc#446998) +- 2.18.0 + +------------------------------------------------------------------- Thu Oct 16 02:37:46 CEST 2008 - ro(a)suse.de - temporary workaround for yast2-schema: Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Jan 27 12:23:34 2009 @@ -388,6 +388,16 @@ Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not change state of the device"), id)); + else if (ret == 5) + // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: device is not a DASD"), id)); + else if (ret == 6) + // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 + Report::Error (sformat ( + // error report, %1 is device identification + _("%1: Could not load module"), id)); else Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code -- 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] r55061 - /branches/SuSE-Code-11-Branch/printer/src/basicadd.ycp
by mzugec＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: mzugec Date: Tue Jan 27 10:42:46 2009 New Revision: 55061 URL: http://svn.opensuse.org/viewcvs/yast?rev=55061&view=rev Log: added string for translation Modified: branches/SuSE-Code-11-Branch/printer/src/basicadd.ycp Modified: branches/SuSE-Code-11-Branch/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/printer/s… ============================================================================== --- branches/SuSE-Code-11-Branch/printer/src/basicadd.ycp (original) +++ branches/SuSE-Code-11-Branch/printer/src/basicadd.ycp Tue Jan 27 10:42:46 2009 @@ -342,7 +342,7 @@ { // Set a fallback driver_filter_string which does not match to anything // to avoid that the full list of thousands of PPDs is shown automatically // because it can take a very long time until the user can proceed: - driver_filter_input_text = "Enter your printer model here."; + driver_filter_input_text = _("Enter your printer model here."); driver_filter_string = "qqqqqqqqqq"; } UI::ReplaceWidget( `id(`driver_filter_input_replace_point), -- 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] r55060 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-main.ycp storage/src/include/ep-summary.ycp storage/src/include/icons.ycp
by aschnell＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: aschnell Date: Tue Jan 27 10:39:35 2009 New Revision: 55060 URL: http://svn.opensuse.org/viewcvs/yast?rev=55060&view=rev Log: - make "Installation Summary" directly accessible in expert partitioner Added: trunk/storage/storage/src/include/ep-summary.ycp Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-main.ycp trunk/storage/storage/src/include/icons.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 27 10:39:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 10:38:28 CET 2009 - aschnell(a)suse.de + +- make "Installation Summary" directly accessible in expert + partitioner + +------------------------------------------------------------------- Fri Jan 16 13:56:03 CET 2009 - kmachalkova(a)suse.cz - Display logical volume name in dialog captions in adding logical Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Tue Jan 27 10:39:35 2009 @@ -59,6 +59,7 @@ include "partitioning/ep-dialogs.ycp"; include "partitioning/ep-graph.ycp"; + include "partitioning/ep-summary.ycp"; include "partitioning/ep-settings.ycp"; include "partitioning/ep-log.ycp"; @@ -97,6 +98,7 @@ `nfs : $[ `create : CreateNfsMainPanel, `handle : HandleNfsMainPanel ], `unused : $[ `create : CreateUnusedPanel, `handle: HandleUnusedPanel ], `graph : $[ `create : CreateGraphPanel, `handle : HandleGraphPanel ], + `summary : $[ `create : CreateSummaryPanel ], `settings : $[ `create : CreateSettingsPanel, `handle : HandleSettingsPanel, `destroy : DestroySettingsPanel ], `log : $[ `create : CreateLogPanel, `handle : HandleLogPanel, `destroy : DestroyLogPanel ] ]; @@ -201,6 +203,9 @@ tree = add(tree, `item(`id(`graph), `icon(graph_icon), _("Graph"), open(`graph))); // tree node label + tree = add(tree, `item(`id(`summary), `icon(summary_icon), _("Installation Summary"), open(`summary))); + + // tree node label tree = add(tree, `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings))); if (Mode::normal()) Added: trunk/storage/storage/src/include/ep-summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-s… ============================================================================== --- trunk/storage/storage/src/include/ep-summary.ycp (added) +++ trunk/storage/storage/src/include/ep-summary.ycp Tue Jan 27 10:39:35 2009 @@ -0,0 +1,34 @@ +/** + * File: ep-summary.ycp + * Package: yast2-storage + * Summary: Expert Partitioner + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ +{ + textdomain "storage"; + + + void CreateSummaryPanel(any user_data) + { + string summary = Storage::ChangeText(); + + if (isempty(summary)) + { + summary = _("No changes to partitioning."); + } + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + // dialog heading + `IconAndHeading(_("Installation Summary"), summary_icon), + `RichText(`id(`summary), summary) + )) + ); + + // helptext + string helptext = _("This view show the installation summary."); + + Wizard::RestoreHelp(helptext); + } +} Modified: trunk/storage/storage/src/include/icons.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/icon… ============================================================================== --- trunk/storage/storage/src/include/icons.ycp (original) +++ trunk/storage/storage/src/include/icons.ycp Tue Jan 27 10:39:35 2009 @@ -25,6 +25,8 @@ const string graph_icon = "yast-device-tree.png"; + const string summary_icon = "yast-disk.png"; + const string settings_icon = "yast.png"; const string log_icon = "yast-messages.png"; -- 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] r55059 - /trunk/packager/src/clients/webpin_package_search.ycp
by kmachalkova＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: kmachalkova Date: Tue Jan 27 10:29:29 2009 New Revision: 55059 URL: http://svn.opensuse.org/viewcvs/yast?rev=55059&view=rev Log: Reverted buggy two-tabbed version Modified: trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Tue Jan 27 10:29:29 2009 @@ -25,7 +25,6 @@ import "Report"; list <map> search_results = []; - list <map> all_selected = []; map <string, integer> index = $[]; boolean AbortDialog() { @@ -79,7 +78,7 @@ UI::ChangeWidget(`id("description"),`Value, ret); } - list CreatePackageListItems( list < map > results ) { + list CreatePackageList( list < map > results ) { list pkg_items = []; integer i = 0; @@ -96,19 +95,7 @@ i = i+1; }); return pkg_items; - } - - void PopulatePackageList( list <map> which ) { - list items = CreatePackageListItems( which ); - - if (which != nil) { - UI::ChangeWidget(`id("results"), `Items, items); - UI::SetFocus(`id("results")); - } - else - UI::SetFocus(`id("search_text")); - - } + } list <map> FilterOutSelectedPackages() { list <string> p = ( list <string> ) UI::QueryWidget(`id("results"), `SelectedItems); @@ -155,12 +142,6 @@ } symbol MainDialog() { - - term current_search_box = `MultiSelectionBox(`id ("results"), `opt (`notify, `hstretch), - "", [] ); - term all_pkgs_box = `MultiSelectionBox(`id ("all"), `opt (`notify, `hstretch), - "", [] ); - Wizard::SetContents ( // TRANSLATORS: dialog caption _("Package Search"), @@ -199,12 +180,11 @@ //), `VWeight ( 2, - `DumbTab( - [ `item(`id("current_tab"), _("&Found Packages")), - `item(`id("all_tab"), _("&All Selected Packages")) - ], - `ReplacePoint(`id(`rp), current_search_box) - ) + `MultiSelectionBox( + `id ("results"), `opt (`notify, `hstretch), + // TRANSLATORS: multi-selection box + _("&Found Packages"), [] + ) ), //`HBox( `Left( `Label( _("Package Description")) ), @@ -235,8 +215,6 @@ UI::SetFocus(`id("search_text")); - list <string> cached_selected_items = []; - any dialog_ret = nil; while (true) { dialog_ret = UI::UserInput(); @@ -258,14 +236,6 @@ break; } else if (dialog_ret == "search") { - - // remember packages selected so far - if (search_results != nil && search_results != []) { - list <map> selected = FilterOutSelectedPackages(); - all_selected = ( list <map> ) union( all_selected, selected ); - y2internal("all selected %1", all_selected); - } - string search_expr = SearchExpression(); if (search_expr != "") { @@ -278,7 +248,15 @@ search_params ); Popup::ClearFeedback(); - PopulatePackageList( search_results ); + list items = CreatePackageList( search_results ); + + if (search_results != nil) { + UI::ChangeWidget(`id("results"), `Items, items); + UI::SetFocus(`id("results")); + } + else + UI::SetFocus(`id("search_text")); + CreatePackageDescription(); } //else @@ -287,17 +265,6 @@ else if (dialog_ret == "results") { CreatePackageDescription(); } - else if (dialog_ret == "current_tab") { - UI::ReplaceWidget(`id(`rp), current_search_box ); - PopulatePackageList( search_results ); - UI::ChangeWidget(`id("results"), `SelectedItems, cached_selected_items); - CreatePackageDescription(); - } - else if (dialog_ret == "all_tab") { - cached_selected_items = (list <string>) UI::QueryWidget(`id("results"), `SelectedItems); - UI::ReplaceWidget(`id(`rp), all_pkgs_box ); - //PopulatePackageList( all_selected ); - } else if (dialog_ret == `abort || dialog_ret == `cancel) { if (AbortDialog()) { dialog_ret = `abort; -- 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] r55058 - /trunk/printer/src/basicadd.ycp
by mzugec＠svn.opensuse.org 27 Jan '09

27 Jan '09

Author: mzugec Date: Tue Jan 27 10:26:31 2009 New Revision: 55058 URL: http://svn.opensuse.org/viewcvs/yast?rev=55058&view=rev Log: one more string for translation Modified: trunk/printer/src/basicadd.ycp Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=550… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Tue Jan 27 10:26:31 2009 @@ -342,7 +342,7 @@ { // Set a fallback driver_filter_string which does not match to anything // to avoid that the full list of thousands of PPDs is shown automatically // because it can take a very long time until the user can proceed: - driver_filter_input_text = "Enter your printer model here."; + driver_filter_input_text = _("Enter your printer model here."); driver_filter_string = "qqqqqqqqqq"; } UI::ReplaceWidget( `id(`driver_filter_input_replace_point), -- 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] r55057 - /tags/branch-Linux-11_0-2_16_49/network/
by mzugec＠svn.opensuse.org 26 Jan '09

26 Jan '09

Author: mzugec Date: Mon Jan 26 18:54:50 2009 New Revision: 55057 URL: http://svn.opensuse.org/viewcvs/yast?rev=55057&view=rev Log: Created tag branch-Linux-11_0-2_16_49 for network Added: tags/branch-Linux-11_0-2_16_49/network/ - copied from r55056, branches/SuSE-Linux-11_0-Branch/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] r55056 - in /branches/SuSE-Linux-11_0-Branch/network: ./ package/ src/isdn/ src/modules/ src/routines/
by mzugec＠svn.opensuse.org 26 Jan '09

26 Jan '09

Author: mzugec Date: Mon Jan 26 18:54:22 2009 New Revision: 55056 URL: http://svn.opensuse.org/viewcvs/yast?rev=55056&view=rev Log: - run isdn only when needed (thanks to Karsten Keil) (bnc#104590) - ISDN: use UNIQUE to match device with configuration (bnc#407683) Modified: branches/SuSE-Linux-11_0-Branch/network/VERSION branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes branches/SuSE-Linux-11_0-Branch/network/src/isdn/config.ycp branches/SuSE-Linux-11_0-Branch/network/src/modules/ISDN.ycp branches/SuSE-Linux-11_0-Branch/network/src/routines/complex.ycp branches/SuSE-Linux-11_0-Branch/network/src/routines/devices.ycp branches/SuSE-Linux-11_0-Branch/network/src/routines/routines.ycp Modified: branches/SuSE-Linux-11_0-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/network/VERSION Mon Jan 26 18:54:22 2009 @@ -1 +1 @@ -2.16.48 +2.16.49 Modified: branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes Mon Jan 26 18:54:22 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 26 18:52:27 CET 2009 - mzugec(a)suse.de + +- run isdn only when needed (thanks to Karsten Keil) (bnc#104590) +- ISDN: use UNIQUE to match device with configuration (bnc#407683) +- 2.16.49 + +------------------------------------------------------------------- Wed Jun 4 12:48:24 CEST 2008 - mzugec(a)suse.cz - fixed command-line (bnc#397016) Modified: branches/SuSE-Linux-11_0-Branch/network/src/isdn/config.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/isdn/config.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/isdn/config.ycp Mon Jan 26 18:54:22 2009 @@ -46,24 +46,25 @@ if (devtype == nil) return; string devnum = regexpsub(d, "^.*/cfg-[a-z]+([0-9]+)", "\\1"); + string devname = sformat("%1%2", devtype, devnum); if (devnum == nil) return; y2debug("devtype=%1 devnum=%2", devtype, devnum); map dev = Devices[devtype]:$[]; - if(haskey(dev, devnum)) { - y2error("device already present: %1", devnum); + if(haskey(dev, devname)) { + y2error("device already present: %1", devname); return; } - string pth = ".isdn.value.\"" + sysconfig + "/cfg-"+devtype+devnum+"\""; + string pth = ".isdn.value.\"" + sysconfig + "/cfg-"+devname+"\""; list<string> values = (list<string>) SCR::Dir(topath(pth)); map config = listmap(string val, values, ``{ string item = (string) SCR::Read(topath(pth + "." + val)); if(item!=nil) return $[ val : item ]; }); - dev[devnum] = config; + dev[devname] = config; Devices[devtype] = dev; }); @@ -90,11 +91,10 @@ /* write all devices */ maplist(string typ, map devsmap, Devices, ``{ - maplist(string num, map devmap, (map<string,map>)devsmap, ``{ + maplist(string dev, map devmap, (map<string,map>)devsmap, ``{ /* write sysconfig */ if (typ != isdntyp) return; - string dev = typ + num; string p = ".isdn.value.\"" + sysconfig + "/cfg-" + dev + "\"."; /* write all keys to config */ @@ -102,9 +102,8 @@ if(k == "module" || k == "options") return; SCR::Write(topath(p+k), devmap[k]:""); }); - string unq = devmap["UDI"]:""; - if(unq != "") - SCR::Write(.probe.status.configured, unq, `yes); +// string unq = devmap["UDI"]:""; +// if(unq != "") SCR::Write(.probe.status.configured, unq, `yes); }); }); Modified: branches/SuSE-Linux-11_0-Branch/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/modules/ISDN.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/modules/ISDN.ycp Mon Jan 26 18:54:22 2009 @@ -354,6 +354,7 @@ y2debug("Packages returns %1", retp); } + boolean haveISDNDev = ($[] != Devices["contr"]:$[]); if(!(modified_hw || modified_if || Provider::Modified("isdn"))) return true; y2milestone("Writing configuration"); @@ -533,8 +534,15 @@ if(Abort()) return false; // last step in writing current ISDN setup - cmd = sformat("/sbin/insserv isdn"); // #104590 - SCR::Execute(.target.bash, cmd); + if(haveISDNDev) { + cmd = sformat("/sbin/insserv isdn"); // #104590 + SCR::Execute(.target.bash, cmd); + } else { + cmd = sformat("/sbin/insserv -r capisuite"); + SCR::Execute(.target.bash, cmd); + cmd = sformat("/sbin/insserv -r isdn"); + SCR::Execute(.target.bash, cmd); + } ProgressNextStage(_("Finished")); sleep(sl); @@ -699,7 +707,7 @@ hw_device["PARA_TYPE"] = sformat("%1", get_i4ltype(hw)); hw_device["PARA_SUBTYPE"] = sformat("%1", get_i4lsubtype(hw)); hw_device["NAME"] = sformat("%1", hw["name"]:"unknown"); - hw_device["UDI"] = hw["unique"]:""; + hw_device["UNIQUE"] = hw["unique"]:""; } /** @@ -718,7 +726,7 @@ y2error("Item not found in Hardware: %1 (%2)", which, size(Hardware)); type = "contr"; - device = GetFreeDevice(type); + device = sformat("%1%2", type, GetFreeDevice(type)); hw_device = set_cardparameters ($[]); set_hwparameters (sel); operation = `add; @@ -731,7 +739,8 @@ */ global define boolean Add() ``{ type = "contr"; - device = GetFreeDevice(type); + device = sformat("%1%2",type, GetFreeDevice(type)); +y2internal("New Added device %1", device); hw_device = set_cardparameters ($[]); operation = `add; return true; @@ -744,18 +753,18 @@ */ global define boolean Edit(string dev) ``{ string typ = NetworkInterfaces::device_type(dev); - string num = NetworkInterfaces::device_num(dev); +// string num = NetworkInterfaces::device_num(dev); map typemap = Devices[typ]:$[]; - if(!haskey(typemap, num)) { + if(!haskey(typemap, dev)) { y2error("Key not found: %1", dev); return false; } - hw_device = typemap[num]:$[]; + hw_device = typemap[dev]:$[]; y2debug("Hardware: %1", Hardware); - device = num; + device = dev; type = typ; hw_device = set_cardparameters (hw_device); y2debug("devmap=%1", hw_device); @@ -771,17 +780,17 @@ global define boolean Delete(string item) ``{ operation = nil; string typ = NetworkInterfaces::device_type(item); - string num = NetworkInterfaces::device_num(item); +// string num = NetworkInterfaces::device_num(item); map typemap = Devices[typ]:$[]; - if(!haskey(typemap, num)) { + if(!haskey(typemap, item)) { y2error("Key not found: %1", item); return false; } if (type == "net") - interface = typemap[num]:$[]; + interface = typemap[item]:$[]; type = typ; - device = num; + device = item; operation = `delete; return true; } @@ -849,8 +858,6 @@ global define boolean Commit() ``{ y2debug("Commit(%1) dev:%2%3",operation,type,device); y2debug("skip %1", skip); - string n = sformat("%1", device); - if (operation == nil) return true; @@ -863,7 +870,7 @@ map typemap = Devices[type]:$[]; y2debug("typemap %1", typemap); - if(!haskey(typemap, n)) { + if(!haskey(typemap, device)) { y2error("Key not found: %1", device); return false; } @@ -987,7 +994,6 @@ ]; }); - //return BuildOverview("contr"); } global define list<map<string,any> > UnconfiguredDev () { Modified: branches/SuSE-Linux-11_0-Branch/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/routines/complex.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/routines/complex.ycp Mon Jan 26 18:54:22 2009 @@ -40,7 +40,7 @@ if (descr != "") return descr; descr = HardwareName (Hardware, devnum); if (descr != "") return descr; - descr = HardwareName (Hardware, devmap["UDI"]:""); + descr = HardwareName (Hardware, devmap["UNIQUE"]:""); if (descr != "") return descr; descr = HardwareName (Hardware, devmap["dev_name"]:""); if (descr != "") return descr; @@ -76,7 +76,7 @@ /* main device summary */ string descr = BuildDescription (devtype, devname, devmap, Hardware); - string unq = devmap["UDI"]:""; + string unq = devmap["UNIQUE"]:""; string status = DeviceStatus(devtype, devname, devmap); if (link) { @@ -119,7 +119,7 @@ /* build a list of unconfigured devices */ integer id=0; maplist(map h, Hardware, { - string unq = h["udi"]:""; + string unq = h["unique"]:""; string busid = "bus-" + h["bus"]:"" + "-" + h["busid"]:""; string mac = "id-" + h["mac"]:""; @@ -416,7 +416,7 @@ string conn=""; string mac_dev=""; foreach(map device, Hardware, { - if (v["udi"]:(v["UDI"]:"")==device["udi"]:"") { + if (v["UNIQUE"]:""==device["unique_key"]:"") { conn = HTML::Bold ( (device["link"]:false == true)?"":_("(not connected)") ); if (size(device["mac"]:"")>0) mac_dev= HTML::Bold ("MAC : ") + device["mac"]:"" + " "; else @@ -455,8 +455,6 @@ string ip = DeviceProtocol(v); string descr = BuildDescription (type, devname, v, Hardware); - // if(size(descr) > 17) descr = substring(descr, 0, 16) + "..."; - string startmode_descr = startmode_descrs[v["STARTMODE"]:""]:_("Started manually"); /* Modem and DSL */ @@ -534,7 +532,7 @@ boolean found=false; foreach(map device, Hardware, { hw_id=hw_id+1; - if (v["udi"]:(v["UDI"]:"")==device["udi"]:"") { found=true; break; } + if (v["UNIQUE"]:""==device["unique_key"]:"") { found=true; break; } }); item = `item(`id(devname), descr, ip, rich, (found) ? hw_id : -1); Modified: branches/SuSE-Linux-11_0-Branch/network/src/routines/devices.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/routines/devices.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/routines/devices.ycp Mon Jan 26 18:54:22 2009 @@ -49,7 +49,7 @@ /* Remaining numbered devices */ while(count < num) { string ii = sformat("%1", i); - if(!contains(curdevs, ii)) { + if(!contains(curdevs, sformat("%1%2", type,ii))) { ret = add(ret, ii); count = count + 1; } @@ -116,7 +116,7 @@ //remove(devmap, dev); devmap = remove(devmap, dev); Devices[type] = devmap; - DeletedDevices = add(DeletedDevices, type+dev); + DeletedDevices = add(DeletedDevices, dev); y2debug("Devices=%1", Devices); y2debug("DeletedDevices=%1", DeletedDevices); Modified: branches/SuSE-Linux-11_0-Branch/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/routines/routines.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/routines/routines.ycp Mon Jan 26 18:54:22 2009 @@ -636,6 +636,7 @@ one["dev_name"] = card["dev_name"]:""; one["requires"] = card["requires"]:[]; one["modalias"] = card["modalias"]:""; + one["unique"] = card["unique_key"]:""; // Each card remembers its position in the list of _all_ cards. // It is used when selecting the card from the list of _unconfigured_ // ones (which may be smaller). #102945. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0