February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55825 - /tags/branch-Code-11-2_17_76/network/
by jsrain＠svn.opensuse.org 28 Feb '09

28 Feb '09

Author: jsrain Date: Sat Feb 28 16:50:48 2009 New Revision: 55825 URL: http://svn.opensuse.org/viewcvs/yast?rev=55825&view=rev Log: Created tag branch-Code-11-2_17_76 for network Added: tags/branch-Code-11-2_17_76/network/ - copied from r55824, branches/SuSE-Code-11-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] r55824 - /tags/branch-Code-11-2_17_76/
by jsrain＠svn.opensuse.org 28 Feb '09

28 Feb '09

Author: jsrain Date: Sat Feb 28 16:50:45 2009 New Revision: 55824 URL: http://svn.opensuse.org/viewcvs/yast?rev=55824&view=rev Log: Created tag branch-Code-11-2_17_76 Added: tags/branch-Code-11-2_17_76/ -- 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] r55823 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by jsrain＠svn.opensuse.org 28 Feb '09

28 Feb '09

Author: jsrain Date: Sat Feb 28 16:50:35 2009 New Revision: 55823 URL: http://svn.opensuse.org/viewcvs/yast?rev=55823&view=rev Log: fixed identification of qeth interfaces (bnc #479481) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Sat Feb 28 16:50:35 2009 @@ -1 +1 @@ -2.17.75 +2.17.76 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Sat Feb 28 16:50:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Feb 28 16:32:25 CET 2009 - jsrain(a)suse.cz + +- fixed identification of qeth interfaces (bnc #479481) +- 2.17.76 + +------------------------------------------------------------------- Fri Feb 27 15:31:32 CET 2009 - kmachalkova(a)suse.cz - Added omitted handling of `hardware symbol in s390 device workflow Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Sat Feb 28 16:50:35 2009 @@ -126,7 +126,7 @@ if (InstallInf["type"]:"" == "hsi" && haskey (InstallInf, "hwaddr")) InstallInf = remove (InstallInf, "hwaddr"); // set HW address only for qeth set to Layer 2 (bnc #479481) - if (InstallInf["type"]:"" == "qeth" && InstallInf["QETH_LAYER2_SUPPORT"]:"0" != "1") + if (InstallInf["type"]:"" == "eth" && InstallInf["QETH_LAYER2_SUPPORT"]:"0" != "1") InstallInf = remove (InstallInf, "hwaddr"); } -- 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] r55822 - /tags/stable-2_18_1/sudo/
by kmachalkova＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: kmachalkova Date: Fri Feb 27 16:00:07 2009 New Revision: 55822 URL: http://svn.opensuse.org/viewcvs/yast?rev=55822&view=rev Log: Created tag stable-2_18_1 for sudo Added: tags/stable-2_18_1/sudo/ - copied from r55821, trunk/sudo/ -- 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] r55821 - in /trunk/sudo: VERSION package/yast2-sudo.changes
by kmachalkova＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: kmachalkova Date: Fri Feb 27 16:00:00 2009 New Revision: 55821 URL: http://svn.opensuse.org/viewcvs/yast?rev=55821&view=rev Log: version++ Modified: trunk/sudo/VERSION trunk/sudo/package/yast2-sudo.changes Modified: trunk/sudo/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/VERSION?rev=55821&r1=55820&… ============================================================================== --- trunk/sudo/VERSION (original) +++ trunk/sudo/VERSION Fri Feb 27 16:00:00 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/sudo/package/yast2-sudo.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/package/yast2-sudo.changes?… ============================================================================== --- trunk/sudo/package/yast2-sudo.changes (original) +++ trunk/sudo/package/yast2-sudo.changes Fri Feb 27 16:00:00 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Feb 27 15:03:57 CET 2009 - kmachalkova(a)suse.cz + +- Do not add extra space to command parameters (bnc#473683) +- Move user selection into pop-up dialog in user/run-as alias config + (bnc#421053) +- Some compatibility fixes (ButtonBoxes, InputFields usage) +- 2.18.1 + +------------------------------------------------------------------- Wed Jan 14 16:35:37 CET 2009 - kmachalkova(a)suse.cz - Show "Really abort?" message only if there is something to save -- 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] r55820 - /tags/stable-2_18_8/printer/
by jsmeix＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsmeix Date: Fri Feb 27 15:45:52 2009 New Revision: 55820 URL: http://svn.opensuse.org/viewcvs/yast?rev=55820&view=rev Log: Created tag stable-2_18_8 for printer Added: tags/stable-2_18_8/printer/ - copied from r55819, trunk/printer/ -- 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] r55819 - in /trunk/printer: VERSION package/yast2-printer.changes src/basicmodify.ycp
by jsmeix＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsmeix Date: Fri Feb 27 15:45:45 2009 New Revision: 55819 URL: http://svn.opensuse.org/viewcvs/yast?rev=55819&view=rev Log: - Added the functionality to basicadd.ycp and basicmodify.ycp to set the default paper size directly when a driver is assigned or when the currently used driver is replaced by another one. - 2.18.8 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/basicmodify.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=55819&r1=558… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Feb 27 15:45:45 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Feb 27 15:45:45 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Feb 27 15:35:16 CET 2009 - jsmeix(a)suse.de + +- Added the functionality to basicadd.ycp and basicmodify.ycp to + set the default paper size directly when a driver is assigned + or when the currently used driver is replaced by another one. +- 2.18.8 + +------------------------------------------------------------------- Thu Feb 26 14:49:04 CET 2009 - jsmeix(a)suse.de - Fixed the "More Drivers" functionality in basicmodify.ycp Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Fri Feb 27 15:45:45 2009 @@ -218,6 +218,29 @@ } } } + // If the currently used driver is replaced by another driver, + // show the same content as in the BasicAddDialog to set the default paper size: + term new_driver_paper_choice_content = `RadioButtonGroup + ( `id(`paper_size_radio_buttons), + `HBox + ( `Label + ( // Label of a RadioButtonGroup to specify the default paper size: + _("Default paper size (if printer and driver supports it)") + ), + // Have none of the RadioButtons preselected which means that + // by default the CUPS default is used for the default paper size. + // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846 + // For CUPS 1.4 the default depends on the "DefaultPaperSize" + // setting in cupsd.conf + // see https://bugzilla.novell.com/show_bug.cgi?id=395760 + // and http://www.cups.org/str.php?L2848 + `HSpacing( 2 ), + `RadioButton( `id(`a4), "A&4" ), + `HSpacing( 1 ), + `RadioButton( `id(`letter), "Le&tter" ), + `HStretch() + ) + ); // Usually the id in the connection items is the matching index number in the connections list. // Here the id of the current connection is set to -1 because the uri of the current connection // is derived from the queues list and this uri may be not present in the connections list @@ -437,6 +460,7 @@ if( ret == `next ) { commandline = "/usr/sbin/lpadmin -h localhost -p '" + name + "'"; boolean something_has_changed = false; + boolean set_paper_size_later = false; integer selected_connection_index = (integer)UI::QueryWidget( `id(`connection_selection), `CurrentItem ); if( selected_connection_index >= 0 ) { uri = Printer::connections[selected_connection_index,"uri"]:""; @@ -451,10 +475,13 @@ if( "" != ppd ) { commandline = commandline + " -m '" + ppd + "'"; something_has_changed = true; + // The paper size for a new driver will be only set + // after the new driver was actually successfully set: + set_paper_size_later = true; } } - if( -1 == selected_ppd_index ) - { // The default paper size can be only set for the currently used driver. + else + { // The default paper size is only set in the same command for the currently used driver. // Depending on the currently used driver no paper size selection might exists // in particular not for a 'raw' queue or when a 'System V style interface script' is used: if( UI::WidgetExists( `id(`paper_size_radio_buttons) ) ) @@ -540,6 +567,44 @@ Printerlib::result["stderr"]:"" ); } + else + { // Set the default paper size for a new driver only + // after a new driver was actually successfully set. + if( set_paper_size_later ) + { // Depending on the previously used driver no paper size selection might exists + // in particular not for a 'raw' queue or when a 'System V style interface script' is used. + // When a driver is set for a 'raw' queue or for a queue with a 'System V style interface script', + // it is therefore not possible to set the default paper size for the new driver now + // so that the user would have to run the modify dialog again to do this. + if( UI::WidgetExists( `id(`paper_size_radio_buttons) ) ) + { default_paper_size = ""; + any paper_size = UI::QueryWidget( `id(`paper_size_radio_buttons), `CurrentButton ); + if( `a4 == paper_size ) + { default_paper_size = "A4"; + } + if( `letter == paper_size ) + { default_paper_size = "Letter"; + } + // Try to set the requested default_paper_size if it is an available choice for this queue. + // If no default_paper_size is requested, the CUPS default is used. + // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846 + // For CUPS 1.4 the default depends on the "DefaultPaperSize" setting in cupsd.conf + // see https://bugzilla.novell.com/show_bug.cgi?id=395760 + // and http://www.cups.org/str.php?L2848 + if( "" != default_paper_size ) + { // '\>' is used to find an available choice also when it is the last value on the line. + // Note the YCP quoting: \\< becomes \< and \\> becomes \> in the commandline. + commandline = "lpoptions -h localhost -p '" + name + "' -l | grep '^PageSize.*\\<" + default_paper_size + "\\>'"; + if( Printerlib::ExecuteBashCommand( commandline ) ) + { commandline = "/usr/sbin/lpadmin -h localhost -p '" + name + "' -o 'PageSize=" + default_paper_size + "'"; + // Do not care if it fails to set the default_paper_size (i.e. show no error message to the user) + // because the default_paper_size setting is nice to have but not mandatoty for a working queue: + Printerlib::ExecuteBashCommand( commandline ); + } + } + } + } + } Wizard::EnableBackButton(); Wizard::EnableNextButton(); } @@ -791,7 +856,10 @@ { // When the currently used driver is to be exchanged, // the widgets to change options for the currently used driver are removed and // the description_input field is overwritten with the NickName of the new selected driver: - UI::ReplaceWidget( `id(`paper_choice_and_driver_options_replace_point), `Empty() ); + //UI::ReplaceWidget( `id(`paper_choice_and_driver_options_replace_point), `Empty() ); + UI::ReplaceWidget( `id(`paper_choice_and_driver_options_replace_point), + `Left( new_driver_paper_choice_content ) + ); string new_description = Printer::ppds[selected_ppd_index,"nickname"]:""; if( "" != model && "unknown" != tolower( model ) @@ -851,23 +919,23 @@ { driver_filter_string = ""; boolean valid_driver_found = false; list driver_items = []; - // Use the existing value of model because for each subsequent run of this more_drivers section - // the existing value of model is shortened at the end (the last word is removed) to get - // more and mor derivers for each subsequent run of this more_drivers section. - y2milestone( "More drivers for '%1'", model ); - if( "" != model - && "unknown" != tolower( model ) + // Use the existing value of driver_filter_input_text + // which is usually set to nick_name and to model as fallback. + driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); + y2milestone( "More drivers for '%1'", driver_filter_input_text ); + if( "" != driver_filter_input_text + && "unknown" != tolower( driver_filter_input_text ) ) - { // If the model string does not contain a space, - // model_words is a singleton list which contains only model. - list <string> model_words = splitstring( model, " " ); - if( size( model_words ) >= 2 ) + { // If the driver_filter_input_text string does not contain a space, + // words is a singleton list which contains only one word. + list <string> words = splitstring( driver_filter_input_text, " " ); + if( size( words ) >= 2 ) { // If there are less than two words the following does not make sense. // Try to find the word which contains a model number. // This is usually the first word which contains a number. string model_number_word = ""; foreach( string word, - model_words, + words, { if( "" != filterchars( word, Printer::number_chars ) ) { model_number_word = word; break; -- 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] r55818 - /tags/branch-Code-11-2_17_75/network/
by kmachalkova＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: kmachalkova Date: Fri Feb 27 15:37:19 2009 New Revision: 55818 URL: http://svn.opensuse.org/viewcvs/yast?rev=55818&view=rev Log: Created tag branch-Code-11-2_17_75 for network Added: tags/branch-Code-11-2_17_75/network/ - copied from r55817, branches/SuSE-Code-11-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] r55817 - /tags/branch-Code-11-2_17_75/
by kmachalkova＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: kmachalkova Date: Fri Feb 27 15:37:17 2009 New Revision: 55817 URL: http://svn.opensuse.org/viewcvs/yast?rev=55817&view=rev Log: Created tag branch-Code-11-2_17_75 Added: tags/branch-Code-11-2_17_75/ -- 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] r55816 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/lan/wizards.ycp
by kmachalkova＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: kmachalkova Date: Fri Feb 27 15:37:11 2009 New Revision: 55816 URL: http://svn.opensuse.org/viewcvs/yast?rev=55816&view=rev Log: wizard sequencer must handle `hardware symbol (#476490) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/lan/wizards.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Fri Feb 27 15:37:11 2009 @@ -1 +1 @@ -2.17.74 +2.17.75 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Fri Feb 27 15:37:11 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 27 15:31:32 CET 2009 - kmachalkova(a)suse.cz + +- Added omitted handling of `hardware symbol in s390 device workflow + (bnc#476490) +- 2.17.75 + +------------------------------------------------------------------- Thu Feb 26 12:07:25 CET 2009 - jsrain(a)suse.cz - store HW address only for L2 qeth devices (bnc #479481) Modified: branches/SuSE-Code-11-Branch/network/src/lan/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/lan/wizards.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/lan/wizards.ycp Fri Feb 27 15:37:11 2009 @@ -170,6 +170,7 @@ ], "s390" : $[ `abort : `abort, + `hardware : "hardware", `next : "address", ], ]; -- 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] r55815 - in /branches/tmp/lslezak/core: dbus/namespace_service/DBusModulesServer.cc dbus/namespace_service/DBusModulesServer.h liby2dbus/src/DBusServerBase.cc liby2dbus/src/DBusServerBase.h
by lslezak＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: lslezak Date: Fri Feb 27 14:54:34 2009 New Revision: 55815 URL: http://svn.opensuse.org/viewcvs/yast?rev=55815&view=rev Log: - DBus service - handle unknown requests, added autoimport functionality Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Fri Feb 27 14:54:34 2009 @@ -76,7 +76,7 @@ y2milestone("Imported name space: %s, using object name: %s", nspace.c_str(), objname.c_str()); - nsmap[objname] = ns; + nsmap[YAST_DBUS_OBJ_PREFIX"/" + objname] = ns; return registerNamespace(ns); } @@ -131,15 +131,18 @@ parindex++; } + std::string namespace_str(nspace); + MakeValidObjectName(namespace_str); + if (params_ok_raw) { sig_raw.params = p_raw; // register the function: register_function(object, interface, method, signature, handler) - register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + namespace_str, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); } sig_marshalled.params = p_marshalled; - register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + namespace_str, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); return true; } @@ -258,6 +261,11 @@ constTypePtr DBusModulesServer::searchFuncType(const std::string &objname, const std::string &fname) const { + if (nsmap.find(objname) == nsmap.end()) + { + y2error("Object: %s not found", objname.c_str()); + return NULL; + } Y2Namespace *ns = nsmap.find(objname)->second; if (ns) @@ -374,12 +382,6 @@ std::string object(request.path()); std::string interface(request.interface()); - // remove the leading slash from the object name - if (!object.empty() && object[0] == '/') - { - object.erase(object.begin()); - } - y2debug("Requested object: %s, interface: %s, method: %s", object.c_str(), interface.c_str(), method.c_str()); constTypePtr t = searchFuncType(object, method); @@ -635,3 +637,47 @@ return retlist; } +// handle unknown requests +DBusMsg DBusModulesServer::unknownRequest(const DBusMsg &request) +{ + y2debug("Unknown request handler called"); + std::string req_path(request.path()); + DBusMsg reply; + + // subtree match + if (req_path.substr(0, sizeof(YAST_DBUS_OBJ_PREFIX) - 1) == YAST_DBUS_OBJ_PREFIX) + { + y2debug("Found object prefix " YAST_DBUS_OBJ_PREFIX " in request"); + std::string req_namespace(req_path, sizeof(YAST_DBUS_OBJ_PREFIX)); + + // hack: replace __ in request to :: to make a valid namespace + // DBus object name cannot contain :: + std::string::size_type pos = req_namespace.find("__"); + if (pos != std::string::npos) + { + req_namespace.replace(pos, 2, "::"); + } + + y2milestone("Autoimporting namespace %s...", req_namespace.c_str()); + + if (importNamespace(req_namespace)) + { + y2milestone("Import succeded, calling the handler again..."); + // call the handler again (polikt has already allowed the access) + reply = handler(request); + y2debug("Request handled"); + } + else + { + reply.createError(request, "Automatic import failed, unknown object", DBUS_ERROR_UNKNOWN_METHOD); + } + } + else + { + reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + } + + return reply; +} + + Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Fri Feb 27 14:54:34 2009 @@ -35,6 +35,8 @@ virtual actionList createActionId(const DBusMsg &msg); + // handle unknown requests + virtual DBusMsg unknownRequest(const DBusMsg &request); private: Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Fri Feb 27 14:54:34 2009 @@ -159,8 +159,8 @@ // create a reply to the message DBusMsg reply; - y2milestone("Received request from %s: interface: %s, method: %s", request.sender().c_str(), - request.interface().c_str(), request.method().c_str()); + y2milestone("Received request from %s: object: %s, interface: %s, method: %s", request.sender().c_str(), + request.path().c_str(), request.interface().c_str(), request.method().c_str()); // handle Introspection request from "org.freedesktop.DBus.Introspectable" "Introspect" if (request.isMethodCall(DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) @@ -247,12 +247,6 @@ // find the registered object std::string objname = request.path(); - // remove the slash at the beginning - if (objname.size() > 0 && objname[0] == '/') - { - objname.erase(objname.begin()); - } - // search the object Objects::const_iterator i = registered_objects.find(objname); @@ -297,14 +291,15 @@ if (!found) { - // report error - reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + // call unknown method handler + y2debug("Calling unknownRequest handler..."); + reply = unknownRequest(request); } } else { // report error - reply.createError(request, "Access denied, check PolicyKit priviledges", DBUS_ERROR_ACCESS_DENIED); + reply.createError(request, "Unknown method or access denied (check PolicyKit priviledges)", DBUS_ERROR_ACCESS_DENIED); } } else if (request.type() == DBUS_MESSAGE_TYPE_ERROR) @@ -461,6 +456,7 @@ DBusServerBase::actionList DBusServerBase::createActionId(const DBusMsg &msg) { + y2debug("Using default empty list of action IDs"); // default implementation is empty list // the inherited classes should redefine it return actionList(); @@ -498,3 +494,12 @@ } } } + +DBusMsg DBusServerBase::unknownRequest(const DBusMsg &request) +{ + DBusMsg err_reply; + y2error("Unknown object, interface or method"); + err_reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + + return err_reply; +} Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Fri Feb 27 14:54:34 2009 @@ -55,6 +55,9 @@ // create PolicyKit action ID for the received message virtual actionList createActionId(const DBusMsg &msg); + // handle unknown requests + virtual DBusMsg unknownRequest(const DBusMsg &request); + std::string service_name; -- 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] r55814 - /tags/stable-2_18_3/users/
by jsuchome＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsuchome Date: Fri Feb 27 14:08:17 2009 New Revision: 55814 URL: http://svn.opensuse.org/viewcvs/yast?rev=55814&view=rev Log: Created tag stable-2_18_3 for users Added: tags/stable-2_18_3/users/ - copied from r55813, trunk/users/ -- 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] r55813 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/dialogs.ycp src/inst_user_first.ycp
by jsuchome＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsuchome Date: Fri Feb 27 14:08:13 2009 New Revision: 55813 URL: http://svn.opensuse.org/viewcvs/yast?rev=55813&view=rev Log: - transliteration of UTF-8 accented characters to ASCII during name generation (bnc#442225) - 2.18.3 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/dialogs.ycp trunk/users/src/inst_user_first.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=55813&r1=55812… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Feb 27 14:08:13 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Feb 27 14:08:13 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 27 13:41:16 CET 2009 - jsuchome(a)suse.cz + +- transliteration of UTF-8 accented characters to ASCII during + name generation (bnc#442225) +- 2.18.3 + +------------------------------------------------------------------- Wed Feb 18 16:01:03 CET 2009 - jsuchome(a)suse.cz - ask for disabling autologin only when adding 2nd user(bnc#332729) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=558… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Fri Feb 27 14:08:13 2009 @@ -115,6 +115,7 @@ YaST::YCP::Import ("FileUtils"); YaST::YCP::Import ("Hostname"); YaST::YCP::Import ("InstExtensionImage"); +YaST::YCP::Import ("Language"); YaST::YCP::Import ("Mode"); YaST::YCP::Import ("NetworkService"); YaST::YCP::Import ("ProductControl"); @@ -1373,5 +1374,22 @@ sformat (__("Releasing %1 extension..."), "cracklib-dict-full.rpm")); } +##------------------------------------ +# use iconv transliteration feature to convert special characters to similar +# ASCII ones (bnc#442225) +BEGIN { $TYPEINFO{Transliterate} = ["function", "string", "string"]; } +sub Transliterate { + + my ($self, $text) = @_; + + return "" if ! $text; + my $language = Language->language (); + my $out = SCR->Execute (".target.bash_output", + "echo '$text' | iconv -f utf-8 -t ascii//translit", + { "LANG" => $language }); + my $stdout = $out->{"stdout"} || ""; + return $stdout; +} + 42 # EOF Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=55813&… ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Fri Feb 27 14:08:13 2009 @@ -966,6 +966,7 @@ { string full = (string)UI::QueryWidget (`id (ret), `Value); full = splitstring (full, " ")[0]:""; + full = UsersSimple::Transliterate (full); UI::ChangeWidget (`id (`username), `Value, tolower ( filterchars (full, UsersSimple::ValidLognameChars ())) ); Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Fri Feb 27 14:08:13 2009 @@ -612,6 +612,7 @@ { string full = (string)UI::QueryWidget (`id (`cn), `Value); full = splitstring (full, " ")[0]:""; + full = UsersSimple::Transliterate (full); UI::ChangeWidget (`id (`username), `Value, tolower ( filterchars (full, UsersSimple::ValidLognameChars ())) ); -- 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] r55812 - /trunk/users/src/inst_auth.ycp
by jsuchome＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsuchome Date: Fri Feb 27 14:06:52 2009 New Revision: 55812 URL: http://svn.opensuse.org/viewcvs/yast?rev=55812&view=rev Log: check if package is installed before checking for availability Modified: trunk/users/src/inst_auth.ycp Modified: trunk/users/src/inst_auth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_auth.ycp?rev=5581… ============================================================================== --- trunk/users/src/inst_auth.ycp (original) +++ trunk/users/src/inst_auth.ycp Fri Feb 27 14:06:52 2009 @@ -189,7 +189,7 @@ "samba" : "yast2-samba-client", "edir_ldap" : "yast2-linux-user-mgmt" ], { if (available == nil) return; - available = Package::Available (package); + available = Package::Installed (package) || Package::Available (package); if (available == true) available_clients = add (available_clients, 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] r55811 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h
by aschnell＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: aschnell Date: Fri Feb 27 12:28:54 2009 New Revision: 55811 URL: http://svn.opensuse.org/viewcvs/yast?rev=55811&view=rev Log: - reduced size of generated code for logging functions Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Fri Feb 27 12:28:54 2009 @@ -360,18 +360,22 @@ } -void -prepareLogStream(std::ostringstream& s) +ostringstream* +logStreamOpen() { - s.imbue(std::locale::classic()); - s.setf(std::ios::boolalpha); - s.setf(std::ios::showbase); + std::ostringstream* stream = new ostringstream; + + stream->imbue(std::locale::classic()); + stream->setf(std::ios::boolalpha); + stream->setf(std::ios::showbase); + + return stream; } void -logMsg(LogLevel level, const char* file, unsigned line, const char* func, - const string& str) +logStreamClose(LogLevel level, const char* file, unsigned line, const char* func, + ostringstream* stream) { using namespace blocxx; @@ -405,9 +409,11 @@ if (!category.empty()) { LogAppender::getCurrentLogAppender()->logMessage(LogMessage(component, category, - String(str), file, - line, func)); + String(stream->str()), + file, line, func)); } + + delete stream; } Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Fri Feb 27 12:28:54 2009 @@ -32,7 +32,7 @@ bool multipleDelim=true, bool skipEmpty=true, const string& quotes="" ); string mergeString( const std::list<string>& l, const string& del=" " ); -std::map<string,string> makeMap( const std::list<string>& l, +std::map<string,string> makeMap( const std::list<string>& l, const string& delim = "=", const string& removeSur = " \t\n" ); @@ -61,24 +61,23 @@ bool testLogLevel(LogLevel level); -void logMsg(LogLevel level, const char* file, unsigned line, - const char* func, const string& str); +std::ostringstream* logStreamOpen(); + +void logStreamClose(LogLevel level, const char* file, unsigned line, + const char* func, std::ostringstream*); -void prepareLogStream(std::ostringstream& s); - #define y2deb(op) y2log_op(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, op) #define y2mil(op) y2log_op(storage::MILESTONE, __FILE__, __LINE__, __FUNCTION__, op) #define y2war(op) y2log_op(storage::WARNING, __FILE__, __LINE__, __FUNCTION__, op) #define y2err(op) y2log_op(storage::ERROR, __FILE__, __LINE__, __FUNCTION__, op) -#define y2log_op(level, file, line, function, op) \ +#define y2log_op(level, file, line, func, op) \ do { \ if (storage::testLogLevel(level)) \ { \ - std::ostringstream __buf; \ - storage::prepareLogStream(__buf); \ - __buf << op; \ - storage::logMsg(level, file, line, function, __buf.str()); \ + std::ostringstream* __buf = storage::logStreamOpen(); \ + *__buf << op; \ + storage::logStreamClose(level, file, line, func, __buf); \ } \ } while (0) -- 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] r55810 - /branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc
by lslezak＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: lslezak Date: Fri Feb 27 12:14:42 2009 New Revision: 55810 URL: http://svn.opensuse.org/viewcvs/yast?rev=55810&view=rev Log: - Dbus service - fixed removing trailing / from path name Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Fri Feb 27 12:14:42 2009 @@ -605,7 +605,7 @@ { if (obj[obj.size() - 1] == '/') { - obj.erase(obj.end()); + obj.erase(obj.size() - 1); } obj.erase(0, obj.rfind("/")); -- 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] r55809 - in /branches/tmp/lslezak/core: configure.in.in dbus/namespace_service/DBusModulesServer.cc dbus/namespace_service/Yast_dbus_names.h.in liby2dbus/src/DBusServerBase.cc
by lslezak＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: lslezak Date: Fri Feb 27 10:56:56 2009 New Revision: 55809 URL: http://svn.opensuse.org/viewcvs/yast?rev=55809&view=rev Log: - DBus service - use /org/opensuse/YaST/modules object prefix Modified: branches/tmp/lslezak/core/configure.in.in branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Modified: branches/tmp/lslezak/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/configure.in… ============================================================================== --- branches/tmp/lslezak/core/configure.in.in (original) +++ branches/tmp/lslezak/core/configure.in.in Fri Feb 27 10:56:56 2009 @@ -144,6 +144,8 @@ AC_SUBST(YAST_DBUS_YCP_INTERFACE) YAST_DBUS_MGR_INTERFACE=org.opensuse.YaST.modules.ModuleManager AC_SUBST(YAST_DBUS_MGR_INTERFACE) +YAST_DBUS_OBJ_PREFIX=/org/opensuse/YaST/modules +AC_SUBST(YAST_DBUS_OBJ_PREFIX) YAST_POLKIT_PREFIX_MANAGER=org.opensuse.yast.module-manager AC_SUBST(YAST_POLKIT_PREFIX_MANAGER) Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Fri Feb 27 10:56:56 2009 @@ -135,11 +135,11 @@ { sig_raw.params = p_raw; // register the function: register_function(object, interface, method, signature, handler) - register_method(nspace, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); } sig_marshalled.params = p_marshalled; - register_method(nspace, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); return true; } @@ -221,12 +221,12 @@ sig.params = p; // register the manager object: register_function(object, interface, method, signature, handler) - register_method("", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_IMPORT_METHOD, sig, manager_callback); + register_method("/", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_IMPORT_METHOD, sig, manager_callback); DBusSignature void_sig; // register the manager object: register_function(object, interface, method, signature, handler) - register_method("", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_UNLOCK_METHOD, void_sig, manager_callback); - register_method("", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_LOCK_METHOD, void_sig, manager_callback); + register_method("/", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_UNLOCK_METHOD, void_sig, manager_callback); + register_method("/", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_LOCK_METHOD, void_sig, manager_callback); } std::string DBusModulesServer::Y2Dtype(constTypePtr type) const @@ -599,10 +599,18 @@ ? YAST_POLKIT_PREFIX_MANAGER : YAST_POLKIT_PREFIX_MODULES); std::string obj(msg.path()); - + + // convert object path "/org/opensuse/yast/Label" to PolKit path "Label" if (!obj.empty()) { - if (obj[0] == '/') + if (obj[obj.size() - 1] == '/') + { + obj.erase(obj.end()); + } + + obj.erase(0, obj.rfind("/")); + + if (!obj.empty() && obj[0] == '/') { obj.erase(obj.begin()); } @@ -615,6 +623,7 @@ ret += '.' + msg.method(); + // make it valid action ID (lowercase chars, replace invalid chars) if (!PolKit::isValidActionID(ret)) { ret = PolKit::makeValidActionID(ret); Modified: branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in Fri Feb 27 10:56:56 2009 @@ -9,6 +9,9 @@ // name of the Yast DBus service #define YAST_DBUS_SERVICE_NAME "@YAST_DBUS_SERVICE@" +// object(path) prefix +#define YAST_DBUS_OBJ_PREFIX "@YAST_DBUS_OBJ_PREFIX@" + // interface name for marshalled YCPValues - using (bsv) DBus structure #define YAST_DBUS_YCP_INTERFACE "@YAST_DBUS_YCP_INTERFACE@" // interface name for raw (direct) DBus values Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Fri Feb 27 10:56:56 2009 @@ -12,6 +12,8 @@ #include <ycp/y2log.h> +#include <algorithm> + // timeout for reading a DBus message (in miliseconds) #define YAST_DBUS_TIMEOUT_VALUE 15000 // the count of timeout events before exiting @@ -164,12 +166,7 @@ if (request.isMethodCall(DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) { y2milestone("Introspecting object: %s", request.path().c_str()); - std::string introspect; - - // root node? - if (request.path() == "/") - { - introspect = + std::string introspect( // introcpection data for the root node DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "\n<node>\n" @@ -177,65 +174,65 @@ " <method name='Introspect'>\n" " <arg name='xml_data' type='s' direction='out'/>\n" " </method>\n" - " </interface>\n"; + " </interface>\n"); + + // add "static" methods (with empty object) + std::string requested_path(request.path()); + + std::list<std::string> announced_objects; - // add "static" methods (with empty object) + for(Objects::const_iterator i = registered_objects.begin(); + i != registered_objects.end(); + ++i) + { + std::string object(i->first); - for(Objects::const_iterator i = registered_objects.begin(); - i != registered_objects.end(); - ++i) + // exact match or a subtree match? + if (object != requested_path) { - std::string object(i->first); + std::string obj_prefix(object, 0, requested_path.size()); - if (!object.empty()) + // subtree match + if (obj_prefix == requested_path) { - introspect += " <node name='" + object + "'/>\n"; - } - else - { - introspect += CreateObjectIntrospection(i->second); - } - } + y2debug("Object: %s, Requested path: %s, Prefix: %s", object.c_str(), + requested_path.c_str(), obj_prefix.c_str() + ); - // close the node section - introspect += "</node>\n"; - } - else - { - introspect = - // introcpection data for the root node - DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE - "\n<node>\n" - " <interface name='"DBUS_INTERFACE_INTROSPECTABLE"'>\n" - " <method name='Introspect'>\n" - " <arg name='xml_data' type='s' direction='out'/>\n" - " </method>\n" - " </interface>\n"; + std::string sub_path(object, obj_prefix.size()); + if (sub_path.size() > 0 && sub_path[0] == '/') + { + sub_path.erase(sub_path.begin()); + } - std::string objname = request.path(); + y2debug("sub_path: %s", sub_path.c_str()); - // remove the slash at the beginning - if (objname.size() > 0 && objname[0] == '/') - { - objname.erase(objname.begin()); - } + std::string node_name(sub_path, 0, sub_path.find("/")); + if (node_name.size() > 0 && node_name[0] == '/') + { + node_name.erase(node_name.begin()); + } - // return properties of the registered object only - Objects::const_iterator i = registered_objects.find(objname); - - if (i == registered_objects.end()) - { - y2warning("Requested object %s is not registered", objname.c_str()); + y2debug("Using node name: %s", node_name.c_str()); + + // check if it has been already added + if (find(announced_objects.begin(), announced_objects.end(), node_name) + == announced_objects.end()) + { + introspect += " <node name='" + node_name + "'/>\n"; + announced_objects.push_back(node_name); + } + } } else { - ObjectData od = i->second; - introspect += CreateObjectIntrospection(od); + introspect += CreateObjectIntrospection(i->second); } - - introspect += " </node>\n"; } + // close the node section + introspect += "</node>\n"; + // create a reply to the request reply.createReply(request); reply.addString(introspect.c_str()); -- 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] r55808 - /trunk/devtools/y2logview/y2log_ana/Makefile.am
by mvidner＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: mvidner Date: Fri Feb 27 10:22:14 2009 New Revision: 55808 URL: http://svn.opensuse.org/viewcvs/yast?rev=55808&view=rev Log: Added long forgotten files Modified: trunk/devtools/y2logview/y2log_ana/Makefile.am Modified: trunk/devtools/y2logview/y2log_ana/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/y2logview/y2log_ana/Mak… ============================================================================== --- trunk/devtools/y2logview/y2log_ana/Makefile.am (original) +++ trunk/devtools/y2logview/y2log_ana/Makefile.am Fri Feb 27 10:22:14 2009 @@ -19,8 +19,10 @@ y2log_ana_LDADD = $(Qt4_LIBS) y2log_ana_SOURCES = cgui.cc \ + cgui.h \ cman.cc \ cy2log.cc \ + cy2log.h \ cgui.moc.cc %.moc.cc: %.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] r55807 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 23:17:51 2009 New Revision: 55807 URL: http://svn.opensuse.org/viewcvs/yast?rev=55807&view=rev Log: - fixed typo Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Feb 26 23:17:51 2009 @@ -2480,7 +2480,7 @@ * @param string device name * @param string disk * @param integer new_cyls (in cylinders) - * @return boolean if successfull + * @return boolean if successful */ global boolean ResizePartition(string device, string disk, integer new_cyls) { @@ -2500,7 +2500,7 @@ * @param string device name * @param string disk * @param integer new_size (in kBytes) - * @return boolean if successfull + * @return boolean if successful */ global boolean ResizeVolume(string device, string disk, integer new_size_k) { -- 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] r55806 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h StorageCallbacks.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:49:55 2009 New Revision: 55806 URL: http://svn.opensuse.org/viewcvs/yast?rev=55806&view=rev Log: - removed old logging functions Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/StorageCallbacks.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Feb 26 22:49:55 2009 @@ -411,27 +411,6 @@ } -void -logMsgVaArgs(LogLevel level, const char* file, unsigned line, const char* func, - const char* format, ...) -{ - if (testLogLevel(level)) - { - char* str; - va_list ap; - - va_start(ap, format); - if (vasprintf(&str, format, ap) == -1) - return; - va_end(ap); - - logMsg(level, file, line, func, str); - - free(str); - } -} - - int readlink(const char* path, string& buf) { Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Feb 26 22:49:55 2009 @@ -64,21 +64,8 @@ void logMsg(LogLevel level, const char* file, unsigned line, const char* func, const string& str); -void logMsgVaArgs(LogLevel level, const char* file, unsigned line, - const char* func, const char* format, ...) - __attribute__ ((format(printf, 5, 6))); - void prepareLogStream(std::ostringstream& s); -#define y2debug(format, ...) \ - logMsgVaArgs(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) -#define y2milestone(format, ...) \ - logMsgVaArgs(storage::MILESTONE, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) -#define y2warning(format, ...) \ - logMsgVaArgs(storage::WARNING, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) -#define y2error(format, ...) \ - logMsgVaArgs(storage::ERROR, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) - #define y2deb(op) y2log_op(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, op) #define y2mil(op) y2log_op(storage::MILESTONE, __FILE__, __LINE__, __FUNCTION__, op) #define y2war(op) y2log_op(storage::WARNING, __FILE__, __LINE__, __FUNCTION__, op) Modified: trunk/storage/libstorage/src/StorageCallbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageCa… ============================================================================== --- trunk/storage/libstorage/src/StorageCallbacks.cc (original) +++ trunk/storage/libstorage/src/StorageCallbacks.cc Thu Feb 26 22:49:55 2009 @@ -36,11 +36,6 @@ #include <y2/Y2Component.h> #include <y2/Y2ComponentBroker.h> -#undef y2milestone -#undef y2error -#undef y2warning -#undef y2debug - #include <Storage.h> using namespace storage; -- 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] r55805 - /trunk/storage/libstorage/src/Volume.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:27:50 2009 New Revision: 55805 URL: http://svn.opensuse.org/viewcvs/yast?rev=55805&view=rev Log: - quote device name Modified: trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Feb 26 22:27:50 2009 @@ -1683,14 +1683,13 @@ { case EXT2: case EXT3: - cmd = "fsck.ext2 -n -f " + use_dev; + cmd = "fsck.ext2 -n -f " + quote(use_dev); break; case REISERFS: - cmd = "reiserfsck --yes --check -q " + use_dev; + cmd = "reiserfsck --yes --check -q " + quote(use_dev); break; default: - cmd = "fsck -n -t " + fsTypeString(detected_fs) + - " " + use_dev; + cmd = "fsck -n -t " + fsTypeString(detected_fs) + " " + quote(use_dev); break; } bool excTime, excLines; -- 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] r55804 - /trunk/storage/libstorage/src/Volume.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:26:27 2009 New Revision: 55804 URL: http://svn.opensuse.org/viewcvs/yast?rev=55804&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Feb 26 22:26:27 2009 @@ -316,7 +316,7 @@ mp.clear(); } if( is_mounted ) - y2milestone( "%s mounted on %s", device().c_str(), mp.c_str() ); + y2mil(device() << " mounted on " << mp); } orig_mp = mp; } @@ -487,8 +487,7 @@ int Volume::setFormat( bool val, storage::FsType new_fs ) { int ret = 0; - y2milestone( "device:%s val:%d fs:%s", dev.c_str(), val, - fs_names[new_fs].c_str() ); + y2mil("device:" << dev << " val:" << val << " fs:" << fs_names[new_fs]); format = val; if( !format ) { @@ -615,8 +614,7 @@ int Volume::changeFstabOptions( const string& options ) { int ret = 0; - y2milestone( "device:%s options:%s encr:%s", dev.c_str(), options.c_str(), - encTypeString(encryption).c_str() ); + y2mil("device:" << dev << " options:" << options << " encr:" << encTypeString(encryption)); if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; @@ -923,7 +921,7 @@ int Volume::umount( const string& mp ) { SystemCmd cmd; - y2milestone( "device:%s mp:%s", dev.c_str(), mp.c_str() ); + y2mil("device:" << dev << " mp:" << mp); string d = mountDevice(); if( dmcrypt_active ) d = dmcrypt_dev; @@ -1070,7 +1068,7 @@ void Volume::rename( const string& newName ) { - y2milestone( "rename old:%s new:%s", nm.c_str(), newName.c_str() ); + y2mil("rename old:" << nm << " new:" << newName); string::size_type pos; if( (pos=dev.rfind( nm ))!=string::npos ) { @@ -1100,7 +1098,7 @@ ret = VOLUME_DEVICE_NOT_PRESENT; else if( !S_ISBLK(sbuf.st_mode) ) ret = VOLUME_DEVICE_NOT_BLOCK; - y2milestone( "checkDevice:%s ret:%d", device.c_str(), ret ); + y2mil("checkDevice:" << device << " ret:" << ret); return( ret ); } @@ -1112,8 +1110,7 @@ lmount += cont->getStorage()->root(); if( mp!="/" ) lmount += mp; - y2milestone( "device:%s mp:%s old mp:%s", dev.c_str(), mp.c_str(), - orig_mp.c_str() ); + y2mil("device:" << dev << " mp:" << mp << " old mp:" << orig_mp); if( !silent() ) { cont->getStorage()->showInfoCb( mountText(true) ); @@ -1163,7 +1160,7 @@ int Volume::canResize( unsigned long long newSizeK ) const { int ret=0; - y2milestone( "val:%llu", newSizeK ); + y2mil("val:" << newSizeK); if( uby.type() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; @@ -1302,7 +1299,7 @@ int Volume::setEncryption( bool val, EncryptType typ ) { int ret = 0; - y2milestone( "val:%d typ:%d", val, typ ); + y2mil("val:" << val << " typ:" << typ); if( getUsedByType() != UB_NONE ) { ret = VOLUME_ALREADY_IN_USE; @@ -1442,8 +1439,7 @@ else fstab_loop_dev = loop_dev; } - y2milestone( "loop_dev:%s fstab_loop_dev:%s", loop_dev.c_str(), - fstab_loop_dev.c_str() ); + y2mil("loop_dev:" << loop_dev << " fstab_loop_dev:" << fstab_loop_dev); return( ret ); } @@ -1476,7 +1472,7 @@ string cmd = LOSETUPBIN " " + quote(loop_dev) + " "; const Loop* l = static_cast<const Loop*>(this); cmd += quote(l->lfileRealPath()); - y2milestone( "cmd:%s", cmd.c_str() ); + y2mil("cmd:" << cmd); return( cmd ); } @@ -1572,7 +1568,7 @@ } } - y2milestone( "cmd:%s", cmd.c_str() ); + y2mil("cmd:" << cmd); return( cmd ); } @@ -1580,7 +1576,7 @@ Volume::setCryptPwd( const string& val ) { #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "password:%s", val.c_str() ); + y2mil("password:" << val); #endif int ret = 0; @@ -1640,7 +1636,7 @@ if( getContainer()->getStorage()->test() ) { ret = encryption = orig_encryption = ENC_TWOFISH; - y2milestone( "ret:%s", encTypeString(ret).c_str() ); + y2mil("ret:" << encTypeString(ret)); return( ret ); } @@ -1650,7 +1646,7 @@ string fname = cont->getStorage()->tmpDir()+"/pwdf"; string mpname = cont->getStorage()->tmpDir()+"/mp"; SystemCmd c; - y2milestone( "device:%s", dev.c_str() ); + y2mil("device:" << dev); mkdir( mpname.c_str(), 0700 ); getFreeLoop(); @@ -1700,8 +1696,8 @@ bool excTime, excLines; c.executeRestricted( cmd, 15, 500, excTime, excLines ); bool ok = c.retcode()==0 || (excTime && !excLines); - y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d", - ok, c.retcode(), excTime, excLines ); + y2mil("ok:" << ok << " retcode:" << c.retcode() << " excTime:" << excTime << + " excLines:" << excLines); if( ok ) { c.execute(MODPROBEBIN " " + fs_names[detected_fs]); @@ -1738,15 +1734,14 @@ unlink( fname.c_str() ); rmdir( mpname.c_str() ); rmdir( cont->getStorage()->tmpDir().c_str() ); - y2milestone( "ret:%s", encTypeString(ret).c_str() ); + y2mil("ret:" << encTypeString(ret)); return( ret ); } int Volume::doLosetup() { int ret = 0; - y2milestone( "device:%s mp:%s is_loop:%d loop_active:%d", - dev.c_str(), mp.c_str(), is_loop, loop_active ); + y2mil("device:" << dev << " mp:" << mp << " is_loop:" << is_loop << " loop_active:" << loop_active); if( !silent() && is_loop && !dmcrypt() ) { cont->getStorage()->showInfoCb( losetupText(true) ); @@ -1850,8 +1845,7 @@ int Volume::doCryptsetup() { int ret = 0; - y2milestone( "device:%s mp:%s dmcrypt:%d active:%d", - dev.c_str(), mp.c_str(), dmcrypt(), dmcrypt_active ); + y2mil("device:" << dev << " mp:" << mp << " dmcrypt:" << dmcrypt() << " active:" << dmcrypt_active); if( !silent() && dmcrypt() ) { cont->getStorage()->showInfoCb( crsetupText(true) ); @@ -2079,7 +2073,7 @@ int Volume::setLabel( const string& val ) { int ret=0; - y2milestone( "label:%s", val.c_str() ); + y2mil("label:" << val); FsCapabilities caps; if( cont->getStorage()->getFsCapabilities( fs, caps ) && caps.supportsLabel ) @@ -2100,12 +2094,12 @@ int Volume::mount( const string& m, bool ro ) { SystemCmd cmd; - y2milestone( "device:%s mp:%s ro:%d", dev.c_str(), m.c_str(), ro ); + y2mil("device:" << dev << " mp:" << m << " ro:" << ro); string cmdline; if( fs != SWAP ) { string lmount = (!m.empty())?m:mp; - y2milestone( "device:%s mp:%s", dev.c_str(), lmount.c_str() ); + y2mil("device:" << dev << " mp:" << lmount); string fsn = fs_names[fs]; switch( fs ) { @@ -2184,7 +2178,7 @@ int Volume::prepareRemove() { int ret = 0; - y2milestone( "device:%s", dev.c_str() ); + y2mil("device:" << dev); if( !orig_mp.empty() ) { if( isMounted() ) @@ -2404,7 +2398,7 @@ cont->getStorage()->showInfoCb( fstab->removeText( true, entry.crypto, entry.mount )); } - y2milestone( "before removeEntry" ); + y2mil("before removeEntry"); ret = fstab->removeEntry( entry ); } else if( !mp.empty() && !deleted() ) @@ -2545,13 +2539,13 @@ c.execute( "/etc/init.d/boot.quota restart" ); } } - y2milestone( "changed:%d ret:%d", changed, ret ); + y2mil("changed:" << changed << " ret:" << ret); return( ret ); } void Volume::fstabUpdateDone() { - y2milestone( "begin" ); + y2mil("begin"); orig_fstab_opt = fstab_opt; orig_mount_by = mount_by; orig_encryption = encryption; -- 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] r55803 - /trunk/storage/libstorage/src/Disk.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:12:03 2009 New Revision: 55803 URL: http://svn.opensuse.org/viewcvs/yast?rev=55803&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Disk.cc Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Feb 26 22:12:03 2009 @@ -48,8 +48,7 @@ unsigned num, unsigned long long SizeK, ProcPart& ppart ) : Container(s,Name,staticType()) { - y2milestone( "constructed disk %s nr %u sizeK:%llu", Name.c_str(), num, - SizeK ); + y2mil("constructed disk " << Name << " nr " << num << " sizeK:" << SizeK); logfile_name = Name + decString(num); init_disk = dmp_slave = iscsi = gpt_enlarge = false; ronly = true; @@ -212,7 +211,7 @@ unsigned long long bytes = kb * 1024; bytes += byte_cyl - 1; unsigned long ret = bytes/byte_cyl; - y2milestone( "KB:%lld ret:%ld byte_cyl:%ld", kb, ret, byte_cyl ); + y2mil("KB:" << kb << " ret:" << ret << " byte_cyl:" << byte_cyl); return (ret); } @@ -239,12 +238,11 @@ sector = geometry.sectors>0?geometry.sectors:sector; cyl = geometry.cylinders>0?geometry.cylinders:cyl; } - y2milestone( "After HDIO_GETGEO ret %d Head:%u Sector:%u Cylinder:%lu", - rcode, head, sector, cyl ); + y2mil("After HDIO_GETGEO ret " << rcode << " Head:" << head << " Sector:" << sector << + " Cylinder:" << cyl); __uint64_t sect = 0; rcode = ioctl( fd, BLKGETSIZE64, &sect); - y2milestone( "BLKGETSIZE64 Ret:%d Bytes:%llu", rcode, - (unsigned long long int) sect ); + y2mil("BLKGETSIZE64 Ret:" << rcode << " Bytes:" << sect); if( rcode==0 && sect!=0 ) { sect /= 512; @@ -255,7 +253,7 @@ { unsigned long lsect; rcode = ioctl( fd, BLKGETSIZE, &lsect ); - y2milestone( "BLKGETSIZE Ret:%d Sect:%lu", rcode, lsect ); + y2mil("BLKGETSIZE Ret:" << rcode << " Sect:" << lsect); if( rcode==0 && lsect!=0 ) { cyl = lsect / (unsigned long)(head*sector); @@ -266,7 +264,7 @@ close( fd ); } byte_cyl = head * sector * 512; - y2milestone( "ret:%d byte_cyl:%lu", ret, byte_cyl ); + y2mil("ret:" << ret << " byte_cyl:" << byte_cyl); return( ret ); } @@ -274,7 +272,7 @@ { bool ret = true; sysfs_dir = SysfsDir; - y2mil( "sysfs_dir:" << sysfs_dir ); + y2mil("sysfs_dir:" << sysfs_dir); string SysfsFile = sysfs_dir+"/range"; if( access( SysfsFile.c_str(), R_OK )==0 ) { @@ -310,10 +308,10 @@ string lname( lbuf, count ); if( lname.find( "/session" )!=string::npos ) iscsi = true; - y2mil( "lname:" << lname ); + y2mil("lname:" << lname); } - y2milestone( "Ret:%d Range:%ld Major:%ld Minor:%ld iSCSI:%d", - ret, range, mjr, mnr, iscsi ); + y2mil("Ret:" << ret << " Range:" << range << " Major:" << mjr << " Minor:" << mnr << + " iSCSI:" << iscsi); return( ret ); } @@ -364,10 +362,10 @@ c = sizeK()*2/(s*h); if( c<=0 ) c=1; - y2mil( "new c:" << c ); + y2mil("new c:" << c); } - y2milestone( "line:%s", line.c_str() ); - y2milestone( "c:%lu h:%u s:%u", c, h, s ); + y2mil("line:" << line); + y2mil("c:" << c << " h:" << h << " s:" << s); } bool Disk::detectPartitions( ProcPart& ppart ) @@ -392,13 +390,12 @@ new_cyl = cyl; new_head = head; new_sector = sector; - y2milestone( "After parted Head:%u Sector:%u Cylinder:%lu", - head, sector, cyl ); + y2mil("After parted Head:" << head << " Sector:" << sector << " Cylinder:" << cyl); byte_cyl = head * sector * 512; - y2milestone( "byte_cyl:%lu", byte_cyl ); + y2mil("byte_cyl:" << byte_cyl); } gpt_enlarge = Cmd.select( "fix the GPT to use all" )>0; - y2milestone( "Label:%s gpt_enlarge:%d", dlabel.c_str(), gpt_enlarge ); + y2mil("Label:" << dlabel << " gpt_enlarge:" << gpt_enlarge); if( dlabel!="loop" ) { setLabelData( dlabel ); @@ -438,8 +435,8 @@ ronly = true; } - y2milestone( "ret:%d partitons:%zd detected label:%s label:%s", ret, - vols.size(), detected_label.c_str(), label.c_str() ); + y2mil("ret:" << ret << " partitons:" << vols.size() << " detected label:" << detected_label << + " label:" << label); return( ret ); } @@ -510,8 +507,8 @@ max_logical = min(labels[i].logical,unsigned(range-1)); label = labels[i].name; } - y2milestone( "name:%s ext:%d primary:%d logical:%d", label.c_str(), - ext_possible, max_primary, max_logical ); + y2mil("name:" << label << " ext:" << ext_possible << " primary:" << max_logical << + " logical:" << max_logical); } unsigned long long @@ -527,7 +524,7 @@ { ret = labels[i].max_size_k; } - y2milestone( "label:%s ret:%llu", label.c_str(), ret ); + y2mil("label:" << label << " ret:" << ret); return( ret ); } @@ -650,9 +647,8 @@ TInfo += ","; if( nr>0 ) { - y2milestone( "Fields Num:%d Start:%lu End:%lu Type:%d", - nr, StartM, EndM, type ); - y2milestone( "TInfo:%s", TInfo.c_str() ); + y2mil("Fields Num:" << nr << " Start:" << StartM << " End:" << EndM << " Type:" << type); + y2mil("TInfo:" << TInfo); start = StartM; csize = EndM-StartM+1; if( start+csize > cylinders() ) @@ -766,8 +762,8 @@ id = Partition::ID_APPLE_HFS; } } - y2milestone( "Fields Num:%d Id:%x Ptype:%d Start:%ld Size:%ld", - nr, id, type, start, csize ); + y2mil("Fields Num:" << nr << " Id:" << id << " Ptype:" << type << " Start:" << start << + " Size:" << csize); } return( nr>0 ); } @@ -815,7 +811,7 @@ } } } - y2mil( "nm:" << nm ); + y2mil("nm:" << nm); if( !dmp_slave && !checkPartedValid( ppart, nm, pl, range_exceed ) ) { string txt = sformat( @@ -886,7 +882,7 @@ reg += "p"; reg += "[0-9]+"; list<string> ps = pp.getMatchingEntries( reg ); - y2mil( "regex " << reg << " ps " << ps ); + y2mil("regex " << reg << " ps " << ps); for( list<string>::const_iterator i=ps.begin(); i!=ps.end(); i++ ) { pair<string,unsigned> p = getDiskPartition( *i ); @@ -896,8 +892,8 @@ proc_l[p.second] = kbToCylinder( SizeK ); } } - y2mil( "proc :" << proc_l ); - y2mil( "parted:" << parted_l ); + y2mil("proc :" << proc_l); + y2mil("parted:" << parted_l); if( proc_l.size()>=parted_l.size() && !parted_l.empty() ) { map<unsigned,unsigned long>::const_iterator i, j; @@ -1266,7 +1262,7 @@ int Disk::createPartition( unsigned long cylLen, string& device, bool checkRelaxed ) { - y2milestone( "len %ld relaxed:%d", cylLen, checkRelaxed ); + y2mil("len:" << cylLen << " relaxed:" << checkRelaxed); getStorage()->logCo( this ); int ret = 0; list<Region> free; @@ -1376,8 +1372,7 @@ unsigned long len, string& device, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type " << type << " at " << start << " len " << len << " relaxed:" << checkRelaxed); getStorage()->logCo( this ); int ret = createChecks( type, start, len, checkRelaxed ); int number = 0; @@ -1409,15 +1404,14 @@ addToList( p ); } getStorage()->logCo( this ); - y2milestone( "ret:%d device:%s", ret, ret==0?device.c_str():"" ); + y2mil("ret:" << ret << " device:" << (ret==0?device:"")); return( ret ); } int Disk::createChecks( PartitionType& type, unsigned long start, unsigned long len, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type " << type << " at " << start << " len " << len << " relaxed:" << checkRelaxed); unsigned fuzz = checkRelaxed ? 2 : 0; int ret = 0; Region r( start, len ); @@ -1436,7 +1430,7 @@ } if( ret==0 && (r.end() > cylinders()+fuzz) ) { - y2milestone( "too large for disk cylinders %lu", cylinders() ); + y2mil("too large for disk cylinders " << cylinders()); ret = DISK_PARTITION_EXCEEDS_DISK; } if( ret==0 && len==0 ) @@ -1484,8 +1478,7 @@ int Disk::changePartitionArea( unsigned nr, unsigned long start, unsigned long len, bool checkRelaxed ) { - y2milestone( "begin nr %u at %ld len %ld relaxed:%d", nr, start, len, - checkRelaxed ); + y2mil("begin nr " << nr << " at " << start << " len " << len << " relaxed:" << checkRelaxed); int ret = 0; Region r( start, len ); unsigned fuzz = checkRelaxed ? 2 : 0; @@ -1505,7 +1498,7 @@ } if( ret==0 && r.end() > cylinders()+fuzz ) { - y2milestone( "too large for disk cylinders %lu", cylinders() ); + y2mil("too large for disk cylinders " << cylinders()); ret = DISK_PARTITION_EXCEEDS_DISK; } if( ret==0 && len==0 ) @@ -1658,7 +1651,7 @@ void Disk::changeNumbers( const PartIter& b, const PartIter& e, unsigned start, int incr ) { - y2milestone( "start:%u incr:%d", start, incr ); + y2mil("start:" << start << " incr:" << incr); PartIter i(b); while( i!=e ) { @@ -1785,7 +1778,7 @@ vol.push_back( &(*i) ); } if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } @@ -1866,7 +1859,7 @@ int Disk::doCreateLabel() { - y2milestone( "label:%s", label.c_str() ); + y2mil("label:" << label); int ret = 0; if( !silent ) { @@ -1953,16 +1946,15 @@ new_cyl = c; new_head = h; new_sector = s; - y2milestone( "new parted geometry Head:%u Sector:%u Cylinder:%lu", - new_head, new_sector, new_cyl ); + y2mil("new parted geometry Head:" << new_head << " Sector:" << new_sector << + " Cylinder:" << new_cyl); } } } int Disk::doSetType( Volume* v ) { - y2milestone( "doSetType container %s name %s", name().c_str(), - v->name().c_str() ); + y2mil("doSetType container " << name() << " name " << v->name()); Partition * p = dynamic_cast<Partition *>(v); int ret = 0; if( p != NULL ) @@ -2067,7 +2059,7 @@ if( cmd.numLines()>0 && scanPartedLine( cmd.getLine(0), nr, start, csize, type, id, boot )) { - y2milestone( "really created at cyl:%ld csize:%ld", start, csize ); + y2mil("really created at cyl:" << start << " csize:" << csize); p->changeRegion( start, csize, cylinderToKb(csize) ); unsigned long long s=0; ret = true; @@ -2112,12 +2104,11 @@ std::istringstream data( cmd.getLine(0) ); classic(data); data >> dummy >> s1 >> s2; - y2milestone( "dummy:\"%s\" s1:\"%s\" s2:\"%s\"", dummy.c_str(), - s1.c_str(), s2.c_str() ); + y2mil("dummy:\"" << dummy << "\" s1:\"" << s1 << "\" s2:\"" << s2 << "\""); start = end = 0; s1 >> start; s2 >> end; - y2milestone( "start:%llu end:%llu", start, end ); + y2mil("start:" << start << " end:" << end); ret = end>0; } } @@ -2154,12 +2145,9 @@ getStorage()->showInfoCb( p->createText(true) ); } system_stderr.erase(); - y2milestone( "doCreate container %s name %s", name().c_str(), - p->name().c_str() ); - y2milestone( "doCreate nr:%d start %ld len %ld", p->nr(), - p->cylStart(), p->cylSize() ); - y2milestone( "doCreate detected_label:%s label:%s", - detected_label.c_str(), label.c_str() ); + y2mil("doCreate container " << name() << " name " << p->name()); + y2mil("doCreate nr:" << p->nr() << " start " << p->cylStart() << " len " << p->cylSize()); + y2mil("doCreate detected_label:" << detected_label << " label:" << label); if( detected_label != label ) { ret = doCreateLabel(); @@ -2228,8 +2216,8 @@ if( !ext.empty() ) maxc = ext.begin()->cylEnd(); } - y2milestone( "max %lu end:%lu", maxc, end ); - y2mil( "pp " << *p ); + y2mil("max " << maxc << " end:" << end); + y2mil("pp " << *p); for( PartIter i=pp.begin(); i!=pp.end(); ++i ) { y2mil( "i " << *i ); @@ -2240,21 +2228,19 @@ y2mil( "new maxc " << maxc ); } } - y2milestone( "max %lu", maxc ); + y2mil("max " << maxc); if( new_cyl!=cyl ) { - y2milestone( "parted geometry changed old c:%lu h:%u s:%u", - cyl, head, sector ); - y2milestone( "parted geometry changed new c:%lu h:%u s:%u", - new_cyl, new_head, new_sector ); - y2milestone( "old start:%lu end:%lu", start, end ); + y2mil("parted geometry changed old c:" << cyl << " h:" << head << " s:" << sector); + y2mil("parted geometry changed new c:" << new_cyl << " h:" << new_head << " s:" << new_sector); + y2mil("old start:" << start << " end:" << end); start = start * new_cyl / cyl; end = end * new_cyl / cyl; - y2milestone( "new start:%lu end:%lu", start, end ); + y2mil("new start:" << start << " end:" << end); } if( end>maxc && maxc<=cylinders() ) { - y2milestone( "corrected end from %lu to max %lu", end, maxc ); + y2mil("corrected end from " << end << " to max " << maxc); end = maxc; } if( start==0 && (label == "mac" || label == "amiga") ) @@ -2284,8 +2270,7 @@ // filesystem is a logical partition PartPair lc = partPair(logicalCreated); call_blockdev = lc.length()<=1; - y2milestone( "logicalCreated:%d call_blockdev:%d", - lc.length(), call_blockdev ); + y2mil("logicalCreated:" << lc.length() << " call_blockdev:" << call_blockdev); } } p->setCreated( false ); @@ -2295,8 +2280,7 @@ if( ret==0 && p->type()!=EXTENDED ) { bool used_as_pv = p->getUsedByType() == UB_LVM; - y2milestone( "zeroNew:%d used_as_pv:%d", - getStorage()->getZeroNewPartitions(), used_as_pv ); + y2mil("zeroNew:" << getStorage()->getZeroNewPartitions() << " used_as_pv:" << used_as_pv); if( used_as_pv || getStorage()->getZeroNewPartitions() ) { ret = getStorage()->zeroDevice(p->device(), p->sizeK()); @@ -2345,8 +2329,7 @@ getStorage()->showInfoCb( p->removeText(true) ); } system_stderr.erase(); - y2milestone( "doRemove container %s name %s", name().c_str(), - p->name().c_str() ); + y2mil("doRemove container " << name() << " name " << p->name()); if( !dmp_slave ) { getStorage()->removeDmMapsTo( getPartName(p->OrigNr()) ); @@ -2495,7 +2478,7 @@ bool Disk::isLogical( unsigned nr ) const { bool ret = ext_possible && nr>max_primary; - y2milestone( "nr:%u ret:%d", nr, ret ); + y2mil("nr:" << nr << " ret:" << ret); return( ret ); } @@ -2524,14 +2507,13 @@ if( ret==0 ) { system_stderr.erase(); - y2milestone( "doResize container %s name %s", name().c_str(), - p->name().c_str() ); + y2mil("doResize container " << name() << " name " << p->name()); std::ostringstream cmd_line; classic(cmd_line); unsigned long long start_sect, end_sect; getPartedSectors( p, start_sect, end_sect ); end_sect = start_sect + p->sizeK()*2 - 1; - y2milestone( "end_sect %llu", end_sect ); + y2mil("end_sect " << end_sect); const Partition * after = getPartitionAfter( p ); unsigned long max_end = sizeK()*2-1; if( after!=NULL ) @@ -2573,8 +2555,7 @@ if( ret==0 ) ret = DISK_PARTITION_NOT_FOUND; } - y2milestone( "after resize size:%llu resize:%d", p->sizeK(), - p->needShrink()||p->needExtend() ); + y2mil("after resize size:" << p->sizeK() << " resize:" << (p->needShrink()||p->needExtend())); } if( needExtend && !dmp_slave && p->getFs()!=HFS && p->getFs()!=HFSPLUS && p->getFs()!=VFAT && @@ -2604,7 +2585,7 @@ ret = &(*pi); } if( ret==NULL ) - y2milestone( "ret:NULL" ); + y2mil( "ret:NULL" ); else y2mil( "ret:" << *ret ); return( ret ); -- 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] r55802 - /trunk/storage/libstorage/src/Dasd.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 20:35:55 2009 New Revision: 55802 URL: http://svn.opensuse.org/viewcvs/yast?rev=55802&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Dasd.cc Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Thu Feb 26 20:35:55 2009 @@ -38,12 +38,12 @@ bool ret = true; string cmd_line = FDASDBIN " -p " + quote(device()); system_stderr.erase(); - y2milestone( "executing cmd:%s", cmd_line.c_str() ); + y2mil("executing cmd:" << cmd_line); SystemCmd Cmd( cmd_line ); - y2milestone( "retcode:%d", Cmd.retcode() ); + y2mil("retcode:" << Cmd.retcode()); if( Cmd.retcode() == 0 ) checkFdasdOutput( Cmd, ppart ); - y2milestone( "ret:%d partitons:%zd", ret, vols.size() ); + y2mil("ret:" << ret << " partitons:" << vols.size()); return( ret ); } @@ -54,15 +54,15 @@ system_stderr.erase(); detected_label = "dasd"; setLabelData( "dasd" ); - y2milestone( "executing cmd:%s", cmd_line.c_str() ); + y2mil("executing cmd:" << cmd_line); SystemCmd Cmd( cmd_line ); - y2milestone( "retcode:%d", Cmd.retcode() ); + y2mil("retcode:" << Cmd.retcode()); if( Cmd.retcode() == 0 ) { if( Cmd.select( "^format" )>0 ) { string tmp = Cmd.getLine(0, true); - y2milestone( "Format line:%s", tmp.c_str() ); + y2mil("Format line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = boost::to_lower_copy(extractNthWord(4, tmp), locale::classic()); if( tmp == "cdl" ) @@ -74,16 +74,15 @@ new_cyl = cyl; new_head = head; new_sector = sector; - y2milestone( "After dasdview Head:%u Sector:%u Cylinder:%lu SizeK:%llu", - head, sector, cyl, size_k ); + y2mil("After dasdview head:" << head << " sector:" << sector << " cylinder:" << cyl << " sizeK:" << size_k); byte_cyl = head * sector * 512; - y2milestone( "byte_cyl:%lu", byte_cyl ); + y2mil("byte_cyl:" << byte_cyl); if( size_k==0 ) { size_k = (head*sector*cyl)/2; - y2milestone( "New SizeK:%llu", size_k ); + y2mil("New SizeK:" << size_k); } - y2mil( "fmt:" << fmt ); + y2mil("fmt:" << fmt); switch( fmt ) { case DASDF_CDL: @@ -111,14 +110,13 @@ else { new_sector = sector = 96; - y2milestone( "new sector:%u", sector ); + y2mil("new sector:" << sector); } byte_cyl = head * sector * 512; - y2milestone( "byte_cyl:%lu", byte_cyl ); - y2milestone( "ret:%d partitons:%zd detected label:%s", ret, vols.size(), - label.c_str() ); + y2mil("byte_cyl:" << byte_cyl); + y2mil("ret:" << ret << " partitons:" << vols.size() << " detected label:" << label); ronly = fmt!=DASDF_CDL; - y2milestone( "fmt:%d readonly:%d", fmt, ronly ); + y2mil("fmt:" << fmt << " readonly:" << ronly); return( ret ); } @@ -139,7 +137,7 @@ Data >> devname >> StartM >> EndM; devname.erase(0,device().size()); devname >> nr; - y2milestone( "Fields Num:%d Start:%lu End:%lu", nr, StartM, EndM ); + y2mil("Fields Num:" << nr << " Start:" << StartM << " End:" << EndM); if( nr>0 ) { start = StartM/head; @@ -147,9 +145,9 @@ if( start+csize > cylinders() ) { csize = cylinders()-start; - y2milestone( "new csize:%lu", csize ); + y2mil("new csize:" << csize); } - y2milestone( "Fields Num:%d Start:%ld Size:%ld", nr, start, csize ); + y2mil("Fields Num:" << nr << " Start:" << start << " Size:" << csize); } return( nr>0 ); } @@ -194,14 +192,14 @@ } } } - y2mil( "nm:" << nm ); + y2mil("nm:" << nm); string reg = nm; if( !reg.empty() && reg.find( '/' )!=string::npos && isdigit(reg[reg.length()-1]) ) reg += "p"; reg += "[0-9]+"; list<string> ps = ppart.getMatchingEntries( reg ); - y2mil( "regex " << reg << " ps " << ps ); + y2mil("regex " << reg << " ps " << ps); unsigned long dummy = 0; if( !checkPartedValid( ppart, nm, pl, dummy ) ) { @@ -235,47 +233,47 @@ { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Cylinder line:%s", tmp.c_str() ); + y2mil("Cylinder line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); c=val; } if( cmd.select( "tracks per" )>0 ) { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Tracks line:%s", tmp.c_str() ); + y2mil("Tracks line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); h=val; } if( cmd.select( "blocks per" )>0 ) { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Blocks line:%s", tmp.c_str() ); + y2mil("Blocks line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); s=val; } if( cmd.select( "blocksize" )>0 ) { val = 0; tmp = cmd.getLine(0, true); - y2milestone( "Bytes line:%s", tmp.c_str() ); + y2mil("Bytes line:" << tmp); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); tmp >> val; - y2mil( "val:" << val ); + y2mil("val:" << val); s*=val/512; } - y2milestone( "c:%lu h:%u s:%u", c, h, s ); + y2mil("c:" << c << " h:" << h << " s:" << s); } bool Dasd::detectGeometry() @@ -284,7 +282,7 @@ sector *= 8; byte_cyl *= 8; cyl /= 8; - y2milestone( "cyl:%lu sector:%u byte_cyl:%lu", cyl, sector, byte_cyl ); + y2mil("cyl:" << cyl << " sector:" << sector << " byte_cyl:" << byte_cyl); return( true ); } @@ -300,7 +298,7 @@ int Dasd::removePartition( unsigned nr ) { - y2milestone( "begin nr %u", nr ); + y2mil("begin nr:" << nr); int ret = Disk::removePartition( nr ); if( ret==0 ) { @@ -315,8 +313,7 @@ unsigned long len, string& device, bool checkRelaxed ) { - y2milestone( "begin type %d at %ld len %ld relaxed:%d", type, start, len, - checkRelaxed ); + y2mil("begin type:" << type << " start:" << start << " len:" << len << " relaxed:" << checkRelaxed); int ret = createChecks( type, start, len, checkRelaxed ); int number = 0; if( ret==0 ) @@ -336,7 +333,7 @@ number++; ++i; } - y2milestone( "number %u", number ); + y2mil("number:" << number); changeNumbers( p.begin(), p.end(), number-1, 1 ); } } @@ -430,7 +427,7 @@ void Dasd::getCommitActions( list<commitAction*>& l ) const { - y2mil( "begin:" << name() << " init_disk:" << init_disk ); + y2mil("begin:" << name() << " init_disk:" << init_disk); Disk::getCommitActions( l ); if( init_disk ) { @@ -504,7 +501,7 @@ else ret = Disk::getToCommit( stage, col, vol ); if( col.size()!=oco || vol.size()!=ovo ) - y2milestone( "ret:%d col:%zd vol:%zd", ret, col.size(), vol.size()); + y2mil("ret:" << ret << " col:" << col.size() << " vol:" << vol.size()); return( ret ); } @@ -533,7 +530,7 @@ int Dasd::doDasdfmt() { int ret = 0; - y2milestone( "dasd:%s", device().c_str() ); + y2mil("dasd:" << device()); list<Disk*> dl; list<string> devs; getStorage()->getDiskList( needDasdfmt, dl ); @@ -543,7 +540,7 @@ { devs.push_back( undevDevice((*i)->device()) ); } - y2mil( "devs:" << devs ); + y2mil("devs:" << devs); if( !silent ) { string txt = dasdfmtTexts( dl.size()==1, mergeString(devs) ); @@ -555,7 +552,7 @@ *i = "-f " + quote(*i); } string cmd_line = DASDFMTBIN " -Y -P 4 -b 4096 -y -m 1 -d cdl " + mergeString(devs); - y2milestone( "cmdline:%s", cmd_line.c_str() ); + y2mil("cmdline:" << cmd_line); CallbackProgressBar cb = getStorage()->getCallbackProgressBarTheOne(); ScrollBarHandler* sb = new DasdfmtScrollbar( cb ); SystemCmd cmd; @@ -581,7 +578,7 @@ int Dasd::initializeDisk( bool value ) { - y2milestone( "value:%d old:%d", value, init_disk ); + y2mil("value:" << value << " old:" << init_disk); int ret = 0; if( init_disk != value ) { @@ -590,11 +587,11 @@ { new_sector = sector = 96; new_head = head = 15; - y2milestone( "new sector:%u head:%u", sector, head ); + y2mil("new sector:" << sector << " head:" << head); size_k = (head*sector*cyl)/2; - y2milestone( "new SizeK:%llu", size_k ); + y2mil("new SizeK:" << size_k); byte_cyl = head * sector * 512; - y2milestone( "new byte_cyl:%lu", byte_cyl ); + y2mil("new byte_cyl:" << byte_cyl); ret = destroyPartitionTable( "dasd" ); } else -- 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] r55801 - in /trunk/gtk: ChangeLog src/YGDialog.cc
by mkudlvasr＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: mkudlvasr Date: Thu Feb 26 20:11:04 2009 New Revision: 55801 URL: http://svn.opensuse.org/viewcvs/yast?rev=55801&view=rev Log: change src/YGDialog.cc to maximize window when screen width <= 800 OR screen height <= 600. There was AND previously. fixes bnc#462476 Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDialog.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=55801&r1=55800… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Feb 26 20:11:04 2009 @@ -1,3 +1,8 @@ +2009-02-26 Martin Kudlvasr <mkudlvasr(a)novell.com> + + * change src/YGDialog.cc to maximize window when screen width <= 800 OR + * screen height <= 600. There was AND previously. + 2009-02-13 Michael Meeks <michael.meeks(a)novell.com> * src/YGUtils.cc (ygutils_convert_to_xhtml): handle Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=55801&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Thu Feb 26 20:11:04 2009 @@ -93,7 +93,7 @@ gtk_window_set_default_size (window, DEFAULT_WIDTH, DEFAULT_HEIGHT); if (YGUI::ui()->setFullscreen()) gtk_window_fullscreen (window); - else if (YUI::app()->displayWidth() <= 800 && YUI::app()->displayHeight() <= 600) + else if (YUI::app()->displayWidth() <= 800 || YUI::app()->displayHeight() <= 600) // maximize for small displays gtk_window_maximize (window); } -- 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] r55800 - /trunk/storage/libstorage/src/Storage.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 19:45:23 2009 New Revision: 55800 URL: http://svn.opensuse.org/viewcvs/yast?rev=55800&view=rev Log: - use new logging functions Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Feb 26 19:45:23 2009 @@ -471,7 +471,7 @@ } else { - y2milestone( "inactive VG %s", i->c_str() ); + y2mil("inactive VG " << *i); v->unuseDev(); delete( v ); } @@ -513,7 +513,7 @@ } else { - y2milestone( "inactive DMRAID %s", i->c_str() ); + y2mil("inactive DMRAID " << *i); v->unuseDev(); delete( v ); } @@ -629,8 +629,7 @@ data.dev[pos] = '/'; pos = data.dev.find('!',pos+1); } - y2milestone( "name sysfs:%s parted:%s", data.name.c_str(), - data.dev.c_str() ); + y2mil("name sysfs:" << data.name << " parted:" << data.dev); Disk * d = NULL; switch( data.typ ) { @@ -861,7 +860,7 @@ string bname( name ); string::size_type pos = bname.rfind( '.' ); bname.erase( pos ); - y2milestone( "name:%s bname:%s", name.c_str(), bname.c_str() ); + y2mil("name:" << name << " bname:" << bname); if( access( bname.c_str(), R_OK )==0 ) { if( !testFilesEqual( bname, name ) ) @@ -985,8 +984,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%d start:%ld size:%ld", disk.c_str(), - type, start, size ); + y2mil("disk:" << disk << " type:" << type << " start:" << start << " size:" << size); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -1027,7 +1025,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1039,8 +1037,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%d start:%lld sizeK:%lld", disk.c_str(), - type, start, sizeK ); + y2mil("disk:" << disk << " type:" << type << " start:" << start << " sizeK:" << sizeK); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -1091,7 +1088,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1102,7 +1099,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s sizeK:%lld", disk.c_str(), sizeK ); + y2mil("disk:" << disk << " sizeK:" << sizeK); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -1141,7 +1138,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1152,7 +1149,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%u", disk.c_str(), type ); + y2mil("disk:" << disk << " type:" << type); DiskIterator i = findDisk( disk ); if( i != dEnd() ) { @@ -1172,7 +1169,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1183,7 +1180,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s type:%u", disk.c_str(), type ); + y2mil("disk:" << disk << " type:" << type); DiskIterator i = findDisk( disk ); if( readonly ) { @@ -1221,7 +1218,7 @@ { ret = STORAGE_DISK_NOT_FOUND; } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -1231,7 +1228,7 @@ unsigned long long ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s size:%ld", disk.c_str(), size ); + y2mil("disk:" << disk << " size:" << size); DiskIterator i = findDisk( disk ); if( i != dEnd() ) { @@ -1247,7 +1244,7 @@ ret = i->cylinderToKb( size ); } } - y2milestone( "ret:%lld", ret ); + y2mil("ret:" << ret); return( ret ); } @@ -1257,7 +1254,7 @@ unsigned long ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s sizeK:%lld", disk.c_str(), sizeK ); + y2mil("disk:" << disk << " sizeK:" << sizeK); DiskIterator i = findDisk( disk ); if( i != dEnd() ) { @@ -1273,7 +1270,7 @@ ret = i->kbToCylinder( sizeK ); } } - y2milestone( "ret:%ld", ret ); + y2mil("ret:" << ret); return( ret ); } @@ -1282,7 +1279,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s", partition.c_str() ); + y2mil("partition:" << partition); VolIterator vol; ContIterator cont; if( readonly ) @@ -1354,8 +1351,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s start:%ld size:%ld", partition.c_str(), - start, size ); + y2mil("partition:" << partition << " start:" << start << " size:" << size); VolIterator vol; ContIterator cont; if( readonly ) @@ -1461,7 +1457,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s id:%x", partition.c_str(), id ); + y2mil("partition:" << partition << " id:" << hex << id); VolIterator vol; ContIterator cont; if( readonly ) @@ -1529,8 +1525,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s newCyl:%lu ignoreFs:%d", partition.c_str(), - sizeCyl, ignoreFs ); + y2mil("partition:" << partition << " newCyl:" << sizeCyl << " ignoreFs:" << ignoreFs); VolIterator vol; ContIterator cont; if( readonly ) @@ -1591,7 +1586,7 @@ { int ret = 0; assertInit(); - y2milestone( "partition:%s", partition.c_str() ); + y2mil("partition:" << partition); VolIterator vol; ContIterator cont; if( readonly ) @@ -1751,7 +1746,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s label:%s", disk.c_str(), label.c_str() ); + y2mil("disk:" << disk << " label:" << label); if( readonly ) { @@ -1793,7 +1788,7 @@ int ret = 0; bool done = false; assertInit(); - y2milestone( "disk:%s value:%d", disk.c_str(), value ); + y2mil("disk:" << disk << " value:" << value); if( readonly ) { @@ -1854,8 +1849,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s format:%d type:%s", device.c_str(), format, - Volume::fsTypeString(fs).c_str() ); + y2mil("device:" << device << " format:" << format << " type:" << Volume::fsTypeString(fs)); VolIterator vol; ContIterator cont; if( readonly ) @@ -1883,7 +1877,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s label:%s", device.c_str(), label.c_str() ); + y2mil("device:" << device << " label:" << label); VolIterator vol; ContIterator cont; if( readonly ) @@ -1911,7 +1905,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( readonly ) @@ -1935,7 +1929,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s opts:%s", device.c_str(), opts.c_str() ); + y2mil("device:" << device << " opts:" << opts); VolIterator vol; ContIterator cont; if( readonly ) @@ -1963,7 +1957,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s opts:%s", device.c_str(), opts.c_str() ); + y2mil("device:" << device << " opts:" << opts); VolIterator vol; ContIterator cont; if( readonly ) @@ -1991,7 +1985,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s txt:%s", device.c_str(), txt.c_str() ); + y2mil("device:" << device << " txt:" << txt); VolIterator vol; ContIterator cont; if( readonly ) @@ -2019,7 +2013,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s mount:%s", device.c_str(), mount.c_str() ); + y2mil("device:" << device << " mount:" << mount); VolIterator vol; ContIterator cont; if( readonly ) @@ -2047,7 +2041,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2067,8 +2061,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s mby:%s", device.c_str(), - Volume::mbyTypeString(mby).c_str() ); + y2mil("device:" << device << " mby:" << Volume::mbyTypeString(mby)); VolIterator vol; ContIterator cont; if( readonly ) @@ -2096,7 +2089,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2114,7 +2107,7 @@ mby = MOUNTBY_DEVICE; ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d mby:%s", ret, Volume::mbyTypeString(mby).c_str()); + y2mil("ret:" << ret << " mby:" << Volume::mbyTypeString(mby)); return( ret ); } @@ -2123,7 +2116,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s options:%s", device.c_str(), options.c_str() ); + y2mil("device:" << device << " options:" << options); VolIterator vol; ContIterator cont; if( readonly ) @@ -2151,7 +2144,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2162,7 +2155,7 @@ { ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d options:%s", ret, options.c_str() ); + y2mil("ret:" << ret << " options:" << options); return( ret ); } @@ -2171,7 +2164,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s options:%s", device.c_str(), options.c_str() ); + y2mil("device:" << device << " options:" << options); VolIterator vol; ContIterator cont; if( readonly ) @@ -2206,7 +2199,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s options:%s", device.c_str(), options.c_str() ); + y2mil("device:" << device << " options:" << options); VolIterator vol; ContIterator cont; if( readonly ) @@ -2238,7 +2231,7 @@ int Storage::setCrypt( const string& device, bool val ) { - y2milestone( "device:%s val:%d", device.c_str(), val ); + y2mil("device:" << device << " val:" << val); return( setCryptType( device, val, ENC_LUKS )); } @@ -2247,7 +2240,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s val:%d type:%d", device.c_str(), val, typ ); + y2mil("device:" << device << " val:" << val << " type:" << typ); VolIterator vol; ContIterator cont; if( readonly ) @@ -2275,7 +2268,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2286,7 +2279,7 @@ { ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d val:%d", ret, val ); + y2mil("ret:" << ret << " val:" << val); return( ret ); } @@ -2295,9 +2288,9 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s l:%zu", device.c_str(), pwd.length() ); + y2mil("device:" << device << " l:" << pwd.length()); #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "password:%s", pwd.c_str() ); + y2mil("password:" << pwd); #endif VolIterator vol; @@ -2326,7 +2319,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; if( readonly ) @@ -2354,7 +2347,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); pwd.clear(); VolIterator vol; @@ -2371,7 +2364,7 @@ ret = checkCache(); } #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "password:%s", pwd.c_str() ); + y2mil("password:" << pwd); #endif y2mil("ret:" << ret); return( ret ); @@ -2382,7 +2375,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s val:%d", device.c_str(), val ); + y2mil("device:" << device << " val:" << val); VolIterator vol; ContIterator cont; if( readonly ) @@ -2410,7 +2403,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str()); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( findVolume( device, cont, vol ) ) @@ -2421,7 +2414,7 @@ { ret = STORAGE_VOLUME_NOT_FOUND; } - y2milestone( "ret:%d val:%d", ret, val ); + y2mil("ret:" << ret << " val:" << val); return( ret ); } @@ -2443,8 +2436,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s newSizeMb:%llu ignoreFs:%d", device.c_str(), - newSizeMb, ignoreFs ); + y2mil("device:" << device << " newSizeMb:" << newSizeMb << " ignoreFs:" << ignoreFs); VolIterator vol; ContIterator cont; if( readonly ) @@ -2477,7 +2469,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ContIterator cont; if( readonly ) @@ -2505,7 +2497,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ContIterator cont; @@ -2590,7 +2582,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); LvmVgIterator i = findLvmVg( name ); if( readonly ) { @@ -2681,8 +2673,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s sizeM:%llu stripe:%u", vg.c_str(), - name.c_str(), sizeM, stripe ); + y2mil("vg:" << vg << " name:" << name << " sizeM:" << sizeM << " stripe:" << stripe); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2700,7 +2691,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret?"":device.c_str() ); + y2mil("ret:" << ret << " device:" << (ret?"":device)); return( ret ); } @@ -2729,7 +2720,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s", vg.c_str(), name.c_str() ); + y2mil("vg:" << vg << " name:" << name); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2757,8 +2748,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s stripe:%lu", vg.c_str(), name.c_str(), - stripe ); + y2mil("vg:" << vg << " name:" << name << " stripe:" << stripe); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2786,8 +2776,7 @@ { int ret = 0; assertInit(); - y2milestone( "vg:%s name:%s stripeSize:%llu", vg.c_str(), name.c_str(), - stripeSize ); + y2mil("vg:" << vg << " name:" << name << " stripeSize:" << stripeSize); LvmVgIterator i = findLvmVg( vg ); if( readonly ) { @@ -2900,7 +2889,7 @@ if (haveMd(md)) nr = md->unusedNumber(); device = "/dev/md" + decString(nr); - y2milestone("ret:%d nr:%d device:%s", ret, nr, device.c_str()); + y2mil("ret:" << ret << " nr:" << nr << " device:" << device); return ret; } @@ -2996,7 +2985,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret==0?device.c_str():"" ); + y2mil("ret:" << ret << " device:" << (ret==0?device:"")); return( ret ); } @@ -3004,7 +2993,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s destroySb:%d", name.c_str(), destroySb ); + y2mil("name:" << name << " destroySb:" << destroySb); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3034,7 +3023,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s dev:%s", name.c_str(), dev.c_str() ); + y2mil("name:" << name << " dev:" << dev); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3064,7 +3053,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s dev:%s", name.c_str(), dev.c_str() ); + y2mil("name:" << name << " dev:" << dev); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3094,7 +3083,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s rtype:%d", name.c_str(), rtype ); + y2mil("name:" << name << " rtype:" << rtype); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3124,7 +3113,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s dev:%lu", name.c_str(), chunk ); + y2mil("name:" << name << " chunk:" << chunk); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3154,7 +3143,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s parity:%d", name.c_str(), ptype ); + y2mil("name:" << name << " parity:" << ptype); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3184,7 +3173,7 @@ { int ret = 0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); unsigned num = 0; MdCo *md = NULL; if( Md::mdStringNum( name, num ) && haveMd(md) ) @@ -3200,7 +3189,7 @@ { int ret = 0; assertInit(); - y2milestone("name:%s", name.c_str()); + y2mil("name:" << name); unsigned num = 0; if (ret == 0 && !Md::mdStringNum(name, num)) { @@ -3214,7 +3203,7 @@ else ret = STORAGE_MD_NOT_FOUND; } - y2milestone("ret:%d", ret); + y2mil("ret:" << ret); return ret; } @@ -3265,8 +3254,7 @@ break; } - y2milestone ("type:%d smallest:%llu sum:%llu size:%llu", md_type, - smallestK, sumK, sizeK); + y2mil("type:" << md_type << " smallest:" << smallestK << " sum:" << sumK << " size:" << sizeK); return ret; } @@ -3383,10 +3371,9 @@ { int ret = 0; assertInit(); - y2milestone( "lname:%s reuseExisting:%d sizeK:%llu mp:%s", lname.c_str(), - reuseExisting, sizeK, mp.c_str() ); + y2mil("lname:" << lname << " reuseExisting:" << reuseExisting << " sizeK:" << sizeK << " mp:" << mp); #ifdef DEBUG_LOOP_CRYPT_PASSWORD - y2milestone( "pwd:%s", pwd.c_str() ); + y2mil("pwd:" << pwd); #endif if( readonly ) { @@ -3444,7 +3431,7 @@ { ret = checkCache(); } - y2milestone( "ret:%d device:%s", ret, ret==0?device.c_str():"" ); + y2mil("ret:" << ret << " device:" << (ret==0?device:"")); return( ret ); } @@ -3454,8 +3441,7 @@ { int ret = 0; assertInit(); - y2milestone( "device:%s lname:%s reuse:%d sizeK:%lld", device.c_str(), - lname.c_str(), reuseExisting, sizeK ); + y2mil("device:" << device << " lname:" << lname << " reuse:" << reuseExisting << " sizeK:" << sizeK); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3481,7 +3467,7 @@ { int ret = 0; assertInit(); - y2milestone( "lname:%s removeFile:%d", lname.c_str(), removeFile ); + y2mil("lname:" << lname << " removeFile:" << removeFile); if( readonly ) { ret = STORAGE_CHANGE_READONLY; @@ -3679,7 +3665,7 @@ y2mil(b.str()); b.str(""); todo.sort( cont_less<commitAction>() ); - y2milestone( "stage %d", stage ); + y2mil("stage:" << stage); b << "sorted co <"; for( list<Container*>::const_iterator i=co.begin(); i!=co.end(); ++i ) { @@ -3752,13 +3738,13 @@ SystemCmd c; CPair p = cPair( notLoop ); int ret = 0; - y2milestone( "empty:%d", p.empty() ); + y2mil("empty:" << p.empty()); if( !p.empty() ) { ret = commitPair( p, notLoop ); } p = cPair( isLoop ); - y2milestone( "empty:%d", p.empty() ); + y2mil("empty:" << p.empty()); if( ret==0 && !p.empty() ) { ret = commitPair( p, isLoop ); @@ -3795,7 +3781,7 @@ Storage::commitPair( CPair& p, bool (* fnc)( const Container& ) ) { int ret = 0; - y2milestone( "p.length:%d", p.length() ); + y2mil("p.length:" << p.length()); CommitStage a[] = { DECREASE, INCREASE, FORMAT, MOUNT }; CommitStage* pt = a; while( unsigned(pt-a) < lengthof(a) ) @@ -3848,7 +3834,7 @@ delete( *ac ); ++ac; } - y2milestone( "stage:%d new_pair:%d", *pt, new_pair ); + y2mil("stage:" << *pt << " new_pair:" << new_pair); if( new_pair ) { p = cPair( fnc ); @@ -3938,7 +3924,7 @@ bool Storage::checkDmMapsTo( const string& dev ) { bool ret = false; - y2milestone( "dev:%s", dev.c_str() ); + y2mil("dev:" << dev); VPair vp = vPair( isDmContainer ); VolIterator v=vp.begin(); while( !ret && v!=vp.end() ) @@ -4662,9 +4648,8 @@ ++c; ret = c!=cp.end(); } - y2milestone( "device:%s ret:%d c->device:%s v->device:%s", device.c_str(), - ret, ret?c->device().c_str():"nil", - ret?v->device().c_str():"nil" ); + y2mil("device:" << device << " ret:" << ret << " c->device:" << (ret?c->device():"NULL") << + " v->device:" << (ret?v->device():"NULL")); return( ret ); } @@ -4749,7 +4734,7 @@ else d = normalizeDevice( device ); if( !label.empty() || !uuid.empty() ) - y2milestone( "label:%s uuid:%s", label.c_str(), uuid.c_str() ); + y2mil("label:" << label << " uuid:" << uuid); VPair p = vPair( also_del?NULL:Volume::notDeleted ); v = p.begin(); if( label.empty() && uuid.empty() ) @@ -4886,7 +4871,7 @@ void Storage::progressBarCb( const string& id, unsigned cur, unsigned max ) { - y2milestone( "id:%s cur:%d max:%d", id.c_str(), cur, max ); + y2mil("id:" << id << " cur:" << cur << " max:" << max); CallbackProgressBar cb = getCallbackProgressBarTheOne(); if( cb ) (*cb)( id, cur, max ); @@ -4894,7 +4879,7 @@ void Storage::showInfoCb( const string& info ) { - y2milestone( "INSTALL INFO:%s", info.c_str() ); + y2mil("INSTALL INFO:" << info); CallbackShowInstallInfo cb = getCallbackShowInstallInfoTheOne(); lastAction = info; if( cb ) @@ -4903,7 +4888,7 @@ void Storage::infoPopupCb( const string& info ) { - y2milestone( "INFO POPUP:%s", info.c_str() ); + y2mil("INFO POPUP:" << info); CallbackInfoPopup cb = getCallbackInfoPopupTheOne(); if( cb ) (*cb)( info ); @@ -4917,7 +4902,7 @@ bool Storage::yesnoPopupCb( const string& info ) { - y2milestone( "YESNO POPUP:%s", info.c_str() ); + y2mil("YESNO POPUP:" << info); CallbackYesNoPopup cb = getCallbackYesNoPopupTheOne(); if( cb ) return (*cb)( info ); @@ -5021,7 +5006,7 @@ { ret = disks_allowed && findDisk( dev )!=dEnd(); } - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -5029,8 +5014,7 @@ unsigned dmnum, unsigned long long siz, storage::EncryptType typ ) { - y2milestone( "dev:%s dm:%s dmn:%u sizeK:%llu", dev.c_str(), dm.c_str(), - dmnum, siz ); + y2mil("dev:" << dev << " dm:" << dm << " dmnum:" << dmnum << " sizeK:" << siz); bool ret=false; VolIterator v; if( dm.find("/temporary-cryptsetup-")==string::npos && @@ -5052,7 +5036,7 @@ while( v!=p.end() && v->device()!=dev ) ++v; bool ret = v!=p.end(); - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -5071,8 +5055,7 @@ { ret = &(*v); } - y2milestone( "dev:%s ret:%s", dev.c_str(), - ret?ret->device().c_str():"nil" ); + y2mil("dev:" << dev << " ret:" << (ret?ret->device():"NULL")); return( ret ); } @@ -5095,7 +5078,7 @@ { ret = v->canUseDevice(); } - y2milestone( "dev:%s ret:%d", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } @@ -5135,7 +5118,7 @@ ret = di->device(); } } - y2milestone( "majmin %s ret:%s", majmin.c_str(), ret.c_str() ); + y2mil("majmin:" << majmin << " ret:" << ret); return( ret ); } @@ -5151,13 +5134,13 @@ } else ret = v->sizeK(); - y2milestone( "dev:%s ret:%llu", dev.c_str(), ret ); + y2mil("dev:" << dev << " ret:" << ret); return( ret ); } int Storage::removeContainer( Container* val, bool call_del ) { - y2milestone( "name:%s call_del:%d", val->name().c_str(), call_del ); + y2mil("name:" << val->name() << " call_del:" << call_del); int ret = 0; CIter i=cont.begin(); while( i!=cont.end() && *i!=val ) @@ -5233,7 +5216,7 @@ { bool ret = false; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; ProcMounts mountData( this ); if( findVolume( device, vol ) ) @@ -5247,7 +5230,7 @@ { mp = mountData.getMount( device ); } - y2milestone( "ret:%d mp:%s", ret, mp.c_str() ); + y2mil("ret:" << ret << " mp:" << mp); return( ret ); } @@ -5256,7 +5239,7 @@ { bool ret = false; assertInit(); - y2milestone( "device:%s", device.c_str() ); + y2mil("device:" << device); VolIterator vol; if( !readonly && findVolume( device, vol ) ) { @@ -5276,8 +5259,7 @@ { bool ret = true; assertInit(); - y2milestone( "device:%s mp:%s ro:%d opts:%s", device.c_str(), mp.c_str(), - ro, opts.c_str() ); + y2mil("device:" << device << " mp:" << mp << " ro:" << ro << " opts:" << opts); VolIterator vol; if( !readonly && findVolume( device, vol ) ) { @@ -5310,7 +5292,7 @@ bool ret = false; VolIterator vol; assertInit(); - y2milestone( "dir:%s", dir.c_str() ); + y2mil("dir:" << dir); EtcFstab *fstab = new EtcFstab( dir, true ); list<FstabEntry> le; fstab->getEntries( le ); @@ -5381,7 +5363,7 @@ bool ret = false; assertInit(); resize_free = df_free = used = 0; - y2milestone( "device:%s use_cache:%d", device.c_str(), use_cache ); + y2mil("device:" << device << " use_cache:" << use_cache); VolIterator vol; if( findVolume( device, vol ) ) { @@ -5498,9 +5480,8 @@ } } if( ret ) - y2milestone( "resize_free:%llu df_free:%llu used:%llu", - resize_free, df_free, used ); - y2milestone( "ret:%d win:%d", ret, win ); + y2mil("resize_free:" << resize_free << " df_free:" << df_free << " used:" << used); + y2mil("ret:" << ret << " win:" << win); return( ret ); } @@ -5509,8 +5490,8 @@ unsigned long long used, bool win, bool efi, bool resize_ok ) { - y2milestone( "device:%s df_free:%llu resize_free:%llu used:%llu win:%d efi:%d", - device.c_str(), df_free, resize_free, used, win, efi ); + y2mil("device:" << device << " df_free:" << df_free << " resize_free:" << resize_free << " used:" << used << + " win:" << win << " efi:" << efi); FreeInfo inf( df_free, resize_free, used, win, efi, resize_ok ); freeInfo[device] = inf; @@ -5533,10 +5514,10 @@ efi = i->second.efi; resize_ok = i->second.rok; } - y2milestone( "device:%s ret:%d", device.c_str(), ret ); + y2mil("device:" << device << " ret:" << ret); if( ret ) - y2milestone( "df_free:%llu resize_free:%llu used:%llu win:%d efi:%d resize_ok:%d", - df_free, resize_free, used, win, efi, resize_ok ); + y2mil("df_free:" << df_free << " resize_free:" << resize_free << " used:" << used << + " win:" << win << " efi:" << efi << " resize_ok:" << resize_ok); return( ret ); } @@ -5553,7 +5534,7 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); if( ret==0 ) { if(checkBackupState(name)) @@ -5568,7 +5549,7 @@ y2mil( "states:" << backupStates() ); y2mil("ret:" << ret); if( ret==0 ) - y2milestone( "comp:%d", equalBackupStates( name, "", true )); + y2mil("comp:" << equalBackupStates(name, "", true)); return( ret ); } @@ -5577,7 +5558,7 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); if( ret==0 ) { if( !name.empty() ) @@ -5604,7 +5585,7 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); if( ret==0 ) { map<string,CCont>::iterator b = backups.find( name ); @@ -5630,7 +5611,7 @@ { bool ret = false; assertInit(); - y2milestone( "name:%s", name.c_str() ); + y2mil("name:" << name); map<string,CCont>::iterator i = backups.find( name ); ret = i!=backups.end(); y2mil("ret:" << ret); @@ -5752,9 +5733,8 @@ { int ret = readonly?STORAGE_CHANGE_READONLY:0; assertInit(); - y2milestone( "device:%s mount:%s vfs:%s opts:%s freq:%u passno:%u", - device.c_str(), mount.c_str(), vfs.c_str(), options.c_str(), - freq, passno ); + y2mil("device:" << device << " mount:" << mount << " vfs:" << vfs << " opts:" << options << + " freq:" << freq << " passno:" << passno); if( ret==0 && (device.empty()||mount.empty()||vfs.empty())) { ret = STORAGE_INVALID_FSTAB_VALUE; -- 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] r55799 - /trunk/storage/libstorage/src/AppUtil.h
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 17:51:58 2009 New Revision: 55799 URL: http://svn.opensuse.org/viewcvs/yast?rev=55799&view=rev Log: - removed unneeded include Modified: trunk/storage/libstorage/src/AppUtil.h Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Feb 26 17:51:58 2009 @@ -1,7 +1,6 @@ #ifndef APP_UTIL_H #define APP_UTIL_H -#include <time.h> #include <libintl.h> #include <string.h> #include <cstdarg> -- 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] r55798 - in /trunk/qt-pkg: package/yast2-qt-pkg.changes src/YQPkgList.cc src/YQPkgObjList.cc
by tgoettlicher＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: tgoettlicher Date: Thu Feb 26 17:04:01 2009 New Revision: 55798 URL: http://svn.opensuse.org/viewcvs/yast?rev=55798&view=rev Log: fixed bnc #469203: sort order in package list Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc trunk/qt-pkg/src/YQPkgObjList.cc Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Feb 26 17:04:01 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 26 17:02:30 CET 2009 - tgoettlicher(a)suse.de + +- Fixed incorrect sort order in package list (bnc #469203) + +------------------------------------------------------------------- Tue Feb 24 16:32:35 CET 2009 - tgoettlicher(a)suse.de - Fixed segfault when switching filters and version tab is shown Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=5579… ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Thu Feb 26 17:04:01 2009 @@ -88,7 +88,7 @@ header()->setSortIndicatorShown( true ); header()->setClickable( true ); - sortByColumn( nameCol(), Qt::AscendingOrder ); + sortByColumn( statusCol(), Qt::AscendingOrder ); setAllColumnsShowFocus( true ); setIconSize( QSize( 22, 16 ) ); Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=5… ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Thu Feb 26 17:04:01 2009 @@ -1479,8 +1479,7 @@ { if ( col == nameCol() ) { - // locale aware sort - return ( strcoll( this->zyppObj()->name().c_str(), other->zyppObj()->name().c_str() ) < 0 ); + return ( strcmp( this->zyppObj()->name().c_str(), other->zyppObj()->name().c_str() ) < 0 ); } if ( col == summaryCol() ) { -- 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] r55797 - in /trunk/sudo/src: complex.ycp dialog-spec.ycp
by kmachalkova＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: kmachalkova Date: Thu Feb 26 16:23:53 2009 New Revision: 55797 URL: http://svn.opensuse.org/viewcvs/yast?rev=55797&view=rev Log: Fixed command editing and deleting Modified: trunk/sudo/src/complex.ycp trunk/sudo/src/dialog-spec.ycp Modified: trunk/sudo/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/complex.ycp?rev=55797&r… ============================================================================== --- trunk/sudo/src/complex.ycp (original) +++ trunk/sudo/src/complex.ycp Thu Feb 26 16:23:53 2009 @@ -152,7 +152,7 @@ } string AddCommandDialog(string c, string p) { - string new_command = c + p; + string new_command = ""; list <string> items = Sudo::GetAliasNames("command"); Modified: trunk/sudo/src/dialog-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-spec.ycp?rev=557… ============================================================================== --- trunk/sudo/src/dialog-spec.ycp (original) +++ trunk/sudo/src/dialog-spec.ycp Thu Feb 26 16:23:53 2009 @@ -11,12 +11,10 @@ include "sudo/complex.ycp"; void RedrawCmndTable (list <string> commands) { - if (commands != []) { - list <term> items = UpdateCmdList(commands); + list <term> items = UpdateCmdList(commands); - UI::ChangeWidget(`id("commands"),`Items, items); - EnableDisableButtons("command_edit", "command_remove", items); - } + UI::ChangeWidget(`id("commands"),`Items, items); + EnableDisableButtons("command_edit", "command_remove", items); } @@ -128,6 +126,7 @@ string new_command = AddCommandDialog("",""); if(new_command != "" && !contains(commands, new_command)) { + y2milestone("%1", new_command); commands = add(commands, new_command); RedrawCmndTable(commands); } @@ -137,8 +136,11 @@ term it = (term) UI::QueryWidget(`id("commands"), `Item(current_item)); string new_command = AddCommandDialog(it[1]:"", it[2]:""); - commands[current_item] = new_command; - RedrawCmndTable(commands); + if( new_command !="") + { + commands[current_item] = new_command; + RedrawCmndTable(commands); + } /* remove command */ } else if (ret == "command_remove") { -- 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] r55796 - in /trunk/installation: package/yast2-installation.changes src/modules/Vendor.ycp
by ug＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: ug Date: Thu Feb 26 16:01:13 2009 New Revision: 55796 URL: http://svn.opensuse.org/viewcvs/yast?rev=55796&view=rev Log: RPMs via driverupdate were not possible Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/Vendor.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Feb 26 16:01:13 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 26 16:00:44 CET 2009 - ug(a)suse.de + +- RPMs via driverupdate were not possible + +------------------------------------------------------------------- Tue Feb 24 13:30:15 CET 2009 - locilka(a)suse.cz - Added support for .xz images deployment (bnc #476079). Modified: trunk/installation/src/modules/Vendor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/Vendor.… ============================================================================== --- trunk/installation/src/modules/Vendor.ycp (original) +++ trunk/installation/src/modules/Vendor.ycp Thu Feb 26 16:01:13 2009 @@ -53,7 +53,7 @@ "echo \"Installing driver update\" >> " + Directory::logdir + "/y2logRPM ; " + "for i in /tmp/update/[0-9]*/install ; do " + " [ -f \"$i/update.tar.gz\" ] && /bin/tar -zxf \"$i/update.tar.gz\" ; " + - " rpm -Uv $i/*.rpm 2 >> " + Directory::logdir + "/y2logRPM ; " + + " rpm -Uv $i/*.rpm 2>> " + Directory::logdir + "/y2logRPM ; " + " [ -f \"$i/update.post\" ] && /bin/chmod +x \"$i/update.post\" && \"$i/update.post\" \"$i\" ; " + "done"); } -- 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] r55795 - /branches/SuSE-Code-11-Branch/doc/_build-www.sh
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 15:59:29 2009 New Revision: 55795 URL: http://svn.opensuse.org/viewcvs/yast?rev=55795&view=rev Log: Using package BuildRequires when building its documentation Modified: branches/SuSE-Code-11-Branch/doc/_build-www.sh Modified: branches/SuSE-Code-11-Branch/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/doc/_buil… ============================================================================== --- branches/SuSE-Code-11-Branch/doc/_build-www.sh (original) +++ branches/SuSE-Code-11-Branch/doc/_build-www.sh Thu Feb 26 15:59:29 2009 @@ -51,7 +51,7 @@ TEST_X=$? echo "Checking for errors..." if [ $TEST_X != 0 ]; then - echo "There were some errors... exiting..." + echo "There were some errors... exiting... current dir: "`pwd` exit 42; fi } @@ -70,15 +70,11 @@ echo echo "*** Checking for installed packages... ***" NEEDED_PACKAGES="docbook2x - docbook-css-stylesheets docbook-dsssl-stylesheets docbook-xml-website docbook-xsl-stylesheets - docbook-simple - docbook-tdg docbook-toys docbook-utils - docbook-xml-slides docbook_3 docbook_4 perl @@ -87,8 +83,8 @@ make gettext-tools gettext-runtime - perl-XML-Generator - fop" + fop + yast2-devtools" echo "Calling zypper install" rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) @@ -123,8 +119,14 @@ echo "*** CREATING ... in source/core" echo "*** CREATING ... in source/core" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} + cd core echo "| Current directory: "`pwd` + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors make clean >> ${BUILDLOG} 2>>${BUILDLOG} @@ -135,6 +137,11 @@ echo "*** CREATING XML SOURCES IN source/libyui/doc ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd libyui + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "2 exiting..." && exit 42) @@ -146,6 +153,11 @@ echo "*** CREATING XML SOURCES IN ycp-ui-bindings ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd ycp-ui-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` # because 'doc' is missing there cp --force SUBDIRS SUBDIRS.doc-build-backup @@ -162,6 +174,11 @@ echo "*** CREATING XML SOURCES IN source/yast2 ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd yast2 + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -176,6 +193,11 @@ echo "*** CREATING XML SOURCES IN source/installation ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd installation + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -204,8 +226,14 @@ # Creating pkg-bindings cd ${SRCDIR} +cd pkg-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} -cd pkg-bindings/doc +cd doc echo "| Current directory: "`pwd` rm -rf html >> ${BUILDLOG} 2>>${BUILDLOG} make >> ${BUILDLOG} 2>>${BUILDLOG} -- 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] r55794 - /trunk/doc/_build-www.sh
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 15:59:21 2009 New Revision: 55794 URL: http://svn.opensuse.org/viewcvs/yast?rev=55794&view=rev Log: Using package BuildRequires when building its documentation Modified: trunk/doc/_build-www.sh Modified: trunk/doc/_build-www.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/doc/_build-www.sh?rev=55794&r1=5… ============================================================================== --- trunk/doc/_build-www.sh (original) +++ trunk/doc/_build-www.sh Thu Feb 26 15:59:21 2009 @@ -51,7 +51,7 @@ TEST_X=$? echo "Checking for errors..." if [ $TEST_X != 0 ]; then - echo "There were some errors... exiting..." + echo "There were some errors... exiting... current dir: "`pwd` exit 42; fi } @@ -70,15 +70,11 @@ echo echo "*** Checking for installed packages... ***" NEEDED_PACKAGES="docbook2x - docbook-css-stylesheets docbook-dsssl-stylesheets docbook-xml-website docbook-xsl-stylesheets - docbook-simple - docbook-tdg docbook-toys docbook-utils - docbook-xml-slides docbook_3 docbook_4 perl @@ -87,8 +83,8 @@ make gettext-tools gettext-runtime - perl-XML-Generator - fop" + fop + yast2-devtools" echo "Calling zypper install" rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) @@ -123,8 +119,14 @@ echo "*** CREATING ... in source/core" echo "*** CREATING ... in source/core" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} + cd core echo "| Current directory: "`pwd` + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors make clean >> ${BUILDLOG} 2>>${BUILDLOG} @@ -135,6 +137,11 @@ echo "*** CREATING XML SOURCES IN source/libyui/doc ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd libyui + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} make ${MAKE_PARAMS} >> ${BUILDLOG} 2>>${BUILDLOG} || (echo "2 exiting..." && exit 42) @@ -146,6 +153,11 @@ echo "*** CREATING XML SOURCES IN ycp-ui-bindings ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd ycp-ui-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` # because 'doc' is missing there cp --force SUBDIRS SUBDIRS.doc-build-backup @@ -162,6 +174,11 @@ echo "*** CREATING XML SOURCES IN source/yast2 ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd yast2 + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -176,6 +193,11 @@ echo "*** CREATING XML SOURCES IN source/installation ***" >> ${BUILDLOG} 2>>${BUILDLOG} cd ${SRCDIR} cd installation + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + echo "| Current directory: "`pwd` make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} checkforerrors @@ -204,8 +226,14 @@ # Creating pkg-bindings cd ${SRCDIR} +cd pkg-bindings + +NEEDED_PACKAGES=`grep "^BuildRequires" yast2*.spec.in | sed 's/BuildRequires:[ \t]\+//' | sed s'/.*\.spec\.in://'` +rpm -q $NEEDED_PACKAGES || zypper in $NEEDED_PACKAGES || (echo "1 exiting..." && exit 42) +checkforerrors + make -f Makefile.cvs >> ${BUILDLOG} 2>>${BUILDLOG} -cd pkg-bindings/doc +cd doc echo "| Current directory: "`pwd` rm -rf html >> ${BUILDLOG} 2>>${BUILDLOG} make >> ${BUILDLOG} 2>>${BUILDLOG} -- 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] r55793 - /tags/stable-2_18_7/printer/
by jsmeix＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsmeix Date: Thu Feb 26 15:27:59 2009 New Revision: 55793 URL: http://svn.opensuse.org/viewcvs/yast?rev=55793&view=rev Log: Created tag stable-2_18_7 for printer Added: tags/stable-2_18_7/printer/ - copied from r55792, trunk/printer/ -- 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] r55792 - in /trunk/printer: VERSION package/yast2-printer.changes src/basicadd.ycp src/basicmodify.ycp src/helps.ycp
by jsmeix＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsmeix Date: Thu Feb 26 15:27:52 2009 New Revision: 55792 URL: http://svn.opensuse.org/viewcvs/yast?rev=55792&view=rev Log: - Fixed the "More Drivers" functionality in basicmodify.ycp to show the current driver topmost in any case. - Enhanced help texts for basicadd.ycp and basicmodify.ycp to describe driver related issues in much more detail. - Call Wizard::SetContents with empty content in basicadd.ycp and basicmodify.ycp to avoid that initially the previous dialog is shown until the real content is generated. - 2.18.7 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/basicadd.ycp trunk/printer/src/basicmodify.ycp trunk/printer/src/helps.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=55792&r1=557… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Feb 26 15:27:52 2009 @@ -1 +1 @@ -2.18.6 +2.18.7 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Feb 26 15:27:52 2009 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Thu Feb 26 14:49:04 CET 2009 - jsmeix(a)suse.de + +- Fixed the "More Drivers" functionality in basicmodify.ycp + to show the current driver topmost in any case. +- Enhanced help texts for basicadd.ycp and basicmodify.ycp + to describe driver related issues in much more detail. +- Call Wizard::SetContents with empty content in basicadd.ycp + and basicmodify.ycp to avoid that initially the previous + dialog is shown until the real content is generated. +- 2.18.7 + +------------------------------------------------------------------- Wed Feb 25 16:19:45 CET 2009 - jsmeix(a)suse.de - Added a "More Drivers" functionality to basicadd.ycp and Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=557… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Thu Feb 26 15:27:52 2009 @@ -47,6 +47,16 @@ { y2milestone( "entering BasicAddDialog" ); // Caption for the "Add Printer" dialog (BasicAddDialog): string caption = _("Add New Printer Configuration"); + // Clear whatever content of a previous dialog which would show up here for several seconds + // until all the following stuff is done before Wizard::SetContentsButtons is called + // which finally shows the right content for this dialog. + Wizard::SetContents( caption, + `Empty(), + HELPS["basic_add_dialog"]:"", + false, + false + ); + Wizard::HideAbortButton(); string driver_filter_string = "BasicAddDialog"; string driver_filter_input_text = ""; string queue_name_proposal = ""; Modified: trunk/printer/src/basicmodify.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicmodify.ycp?rev=… ============================================================================== --- trunk/printer/src/basicmodify.ycp (original) +++ trunk/printer/src/basicmodify.ycp Thu Feb 26 15:27:52 2009 @@ -66,6 +66,16 @@ // Title of the Basic Modify Dialog where %1 will be replaced by the queue name. // The actual queue name is a system value which cannot be translated: string caption = sformat( _("Modify %1") , name ); + // Clear whatever content of a previous dialog which would show up here for several seconds + // until all the following stuff is done before Wizard::SetContentsButtons is called + // which finally shows the right content for this dialog. + Wizard::SetContents( caption, + `Empty(), + HELPS["basic_modify_dialog"]:"", + false, + false + ); + Wizard::HideAbortButton(); string model = ""; list <string> description_words = splitstring( description, " " ); if( size( description_words ) > 2 ) @@ -296,7 +306,7 @@ ( `Left ( `Label ( // Caption for a printer driver selection: - _("Driver") + _("Adjust Options of the Current Driver or Assign a Different Driver") ) ), `ReplacePoint @@ -971,16 +981,17 @@ driver_items = Printer::DriverItems( "", true ); } UI::ReplaceWidget( `id(`driver_selection_replace_point), - `SelectionBox - ( `id(`driver_selection), - // By default there is no UserInput() - // if only something was selected in the SelectionBox - // (without clicking additionally a button) - // but the notify option forces UserInput() in this case: - `opt(`notify), - "", - driver_items - ) + `SelectionBox( `id(`driver_selection), + // By default there is no UserInput() + // if only something was selected in the SelectionBox + // (without clicking additionally a button) + // but the notify option forces UserInput() in this case: + `opt(`notify), + "", + prepend( driver_items, + current_driver + ) + ) ); continue; } Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=55792&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Thu Feb 26 15:27:52 2009 @@ -147,7 +147,48 @@ The driver determines that the right data is produced for the specific printer model. If a wrong driver is assigned, wrong data is sent to the printer -which results bad looking printout, chaotic printout, or no printout at all. +which results bad looking printout, chaotic printout, or no printout at all. +Initially the input field for the driver search string is preset +with the autodetected model name of the currently selected connection +and those drivers where the driver description matches to the model name +are shown by default. +If driver descriptions match to the autodetected model name +and if all matching driver descriptions seem to belong to the same model, +the driver descriptions are sorted so that the most reasonable driver +should be listed topmost and this one is automatically preselected. +If no driver is automatically preselected, you must manually +find and select an appropriate driver. +On the other hand if a driver was automatically preselected, +it does not necessarily mean that this driver is +a reasonable driver for your particular needs. +Strictly speaking an automatically preselected driver +may not work at all for your particular printer model. +The reason is that the automated driver selection +can only work based upon comparison of strings +(the autodetected model name and the driver descriptions) +so that the result can be only a best-guess proposal +how to set up your particular printer model. +Therefore check if the currently preselected values make sense +and feel free to play around and modify the settings +to what you know what works best for your printer. +If no driver description matches to the autodetected model name, +it does not necessarily mean that there is no driver available for the model. +Often only the model name in the driver descriptions +is different from the autodetected model name. +Therefore you can enter whatever you like as driver search string +and search through all available driver descriptions. +Usually the default driver option settings should be reasonable +so that the driver works for your particular printer model. +Some driver option settings must match to your particular printer. +In particular the default paper size setting of the driver +must match to the paper which is actually loaded in your printer. +You can either explicitely select A4 or Letter as default paper size +or select nothing to use the built-in default paper size of the driver +which is also the fallback if the driver neither supports A4 nor Letter +(for example a driver for a small-format photo printer). +If you like to adjust other driver options except A4 or Letter, +you must first set up the queue and then in a second step +you can adjust all driver options in the 'Edit/Modify' dialog. ") + // BasicAddDialog help 5/5: _(" @@ -175,7 +216,34 @@ The latter is provided by the HP driver package 'hplip'. For plain printing both kind of connections should work but for anything else (e.g. device status via 'hp-toolbox', or scanning with a HP all-in-one device) -the 'hp:/...' connection must be used. +the 'hp:/...' connection must be used. +When you exchange the currently used connection by another one, +the input field for the driver search string is preset +with the autodetected model name of the new selected connection +and those drivers where the driver description matches to the model name +are shown by default. +If driver descriptions match to the autodetected model name +and if all matching driver descriptions seem to belong to the same model, +the driver descriptions are sorted so that the most reasonable driver +should be listed topmost (but still below the currently used driver). +On the other hand, it does not necessarily mean that this driver is +a reasonable driver for your particular needs. +Strictly speaking the topmost listed driver +may not work at all for your particular printer model. +The reason is that the automated driver selection +can only work based upon comparison of strings +(the autodetected model name and the driver descriptions) +so that the result can be only a best-guess proposal +how to set up your particular printer model. +Therefore check if the currently preselected values make sense +and feel free to play around and modify the settings +to what you know what works best for your printer. +If no driver description matches to the autodetected model name, +it does not necessarily mean that there is no driver available for the model. +Often only the model name in the driver descriptions +is different from the autodetected model name. +Therefore you can enter whatever you like as driver search string +and search through all available driver descriptions. ") + // BasicModifyDialog help 3/4: _(" @@ -193,7 +261,21 @@ should work for the particular driver. Nevertheless it may happen that your particular printer fails to print with high resolution. For example when you have a laser printer -which has insufficient built-in memory to process high resolution pages. +which has insufficient built-in memory to process high resolution pages. +When you exchange the currently used driver by another one, +you must first apply this change to the print queue +so that the new driver is used for the queue +(i.e. you must finish this dialog as a first step) +and then in a second step you can adjust all driver options +by using this dialog again. +Initially the input field for the driver search string is preset +with the description of the currently used driver when the connection was not changed. +This results usually only one single driver which matches +so that you would have to enter a less specific driver search string +to get also other drivers or you use the 'More Drivers' button. +If no driver matches, it does not mean that there is no driver available. +Therefore you can enter whatever you like as driver search string +and search through all available driver descriptions. ") + // BasicModifyDialog help 4/4: _(" @@ -299,9 +381,9 @@ (separated by slash '/' characters) which specify the details for this kind of data-transfer. Finally there could be optional parameters (separated by a question mark '?') -of the form option1=value1&option2=value2&option3=value3 so that +of the form option1=value1&option2=value2&option3=value3 so that a full device URI could be for example: -ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false +ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false Special characters must be percent-encoded (also known as URL encoding). For example a space character ' ' must be written as '%20' and a plus sign '+' must be written as '%2B'. -- 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] r55791 - in /trunk/storage/libstorage/src: SystemCmd.cc SystemCmd.h
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 14:48:12 2009 New Revision: 55791 URL: http://svn.opensuse.org/viewcvs/yast?rev=55791&view=rev Log: - some SystemCmd cleanup: - removed unused code - use const string& as parameter - other minor issues Modified: trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Thu Feb 26 14:48:12 2009 @@ -22,14 +22,6 @@ using namespace storage; -SystemCmd::SystemCmd( const char* Command ) -{ - y2mil("constructor SystemCmd:\"" << Command << "\""); - init(); - execute( Command ); -} - - SystemCmd::SystemCmd( const string& Command_Cv ) { y2mil("constructor SystemCmd:\"" << Command_Cv << "\""); @@ -48,8 +40,6 @@ void SystemCmd::init() { Combine_b = false; - OutputHandler_f = NULL; - HandlerPar_p = NULL; output_proc = NULL; File_aC[0] = File_aC[1] = NULL; pfds[0].events = pfds[1].events = POLLIN; @@ -66,14 +56,6 @@ void -SystemCmd::setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ) - { - OutputHandler_f = Handle_f; - HandlerPar_p = Par_p; - } - - -void SystemCmd::closeOpenFds() { int max_fd = getdtablesize(); @@ -85,7 +67,7 @@ int -SystemCmd::execute( const string& Cmd_Cv ) +SystemCmd::execute(const string& Cmd_Cv) { y2mil("SystemCmd Executing:\"" << Cmd_Cv << "\""); Background_b = false; @@ -169,7 +151,7 @@ #define ALTERNATE_SHELL "/bin/bash" int -SystemCmd::doExecute( string Cmd ) +SystemCmd::doExecute( const string& Cmd ) { string Shell_Ci = PRIMARY_SHELL; if( access( Shell_Ci.c_str(), X_OK ) != 0 ) @@ -305,13 +287,13 @@ { int Wait_ii; int Status_ii; - int sel; do { y2deb("[0] id:" << pfds[0].fd << " ev:" << hex << (unsigned)pfds[0].events << dec << " [1] fs:" << (Combine_b?-1:pfds[1].fd) << " ev:" << hex << (Combine_b?0:(unsigned)pfds[1].events)); - if( (sel=poll( pfds, Combine_b?1:2, 1000 ))<0 ) + int sel = poll( pfds, Combine_b?1:2, 1000 ); + if (sel < 0) { y2err("poll failed errno:" << errno << " (" << strerror(errno) << ")"); } @@ -324,6 +306,7 @@ y2deb("Wait ret:" << Wait_ii); } while( Hang_bv && Wait_ii == 0 ); + if( Wait_ii != 0 ) { checkOutput(); @@ -429,30 +412,24 @@ int -SystemCmd::select( string Pat_Cv, bool Invert_bv, OutputStream Idx_iv ) +SystemCmd::select( const string& Pat_Cv, bool Invert_bv, OutputStream Idx_iv ) { - int I_ii; - int End_ii; - int Size_ii; - string::size_type Pos_ii; - bool BeginOfLine_bi; - string Search_Ci( Pat_Cv ); - if( Idx_iv > 1 ) { y2err("invalid index " << Idx_iv); } - BeginOfLine_bi = Search_Ci.length()>0 && Search_Ci[0]=='^'; + string Search_Ci( Pat_Cv ); + bool BeginOfLine_bi = Search_Ci.length()>0 && Search_Ci[0]=='^'; if( BeginOfLine_bi ) { Search_Ci.erase( 0, 1 ); } SelLines_aC[Idx_iv].resize(0); - Size_ii = 0; - End_ii = Lines_aC[Idx_iv].size(); - for( I_ii=0; I_ii<End_ii; I_ii++ ) + int Size_ii = 0; + int End_ii = Lines_aC[Idx_iv].size(); + for( int I_ii=0; I_ii<End_ii; I_ii++ ) { - Pos_ii = Lines_aC[Idx_iv][I_ii].find( Search_Ci ); + string::size_type Pos_ii = Lines_aC[Idx_iv][I_ii].find( Search_Ci ); if( Pos_ii>0 && BeginOfLine_bi ) { Pos_ii = string::npos; @@ -523,11 +500,6 @@ { output_proc->process( Buf_ti, Stderr_bv ); } - if( OutputHandler_f ) - { - y2deb("Calling Output-Handler Buf:\"" << Buf_ti << "\" Stderr:" << Stderr_bv); - OutputHandler_f( HandlerPar_p, Buf_ti, Stderr_bv ); - } } Char_ii = EOF; } @@ -539,11 +511,6 @@ { output_proc->process( Buf_ti, Stderr_bv ); } - if( OutputHandler_f ) - { - y2deb("Calling Output-Handler Buf:\"" << Buf_ti << "\" Stderr:" << Stderr_bv); - OutputHandler_f( HandlerPar_p, Buf_ti, Stderr_bv ); - } } if( Text_Ci.length() > 0 ) { @@ -570,8 +537,8 @@ void -SystemCmd::extractNewline( const char* Buf_ti, int Cnt_iv, bool& NewLine_br, - string& Text_Cr, vector<string>& Lines_Cr ) +SystemCmd::extractNewline(const string& Buf_ti, int Cnt_iv, bool& NewLine_br, + string& Text_Cr, vector<string>& Lines_Cr) { string::size_type Idx_ii; @@ -594,7 +561,7 @@ void -SystemCmd::addLine(string Text_Cv, vector<string>& Lines_Cr) +SystemCmd::addLine(const string& Text_Cv, vector<string>& Lines_Cr) { if (Lines_Cr.size() < 100) { @@ -619,13 +586,15 @@ } -string SystemCmd::quote(const string& str) +string +SystemCmd::quote(const string& str) { return "'" + boost::replace_all_copy(str, "'", "'\\''") + "'"; } -string SystemCmd::quote(const list<string>& strs) +string +SystemCmd::quote(const list<string>& strs) { string ret; for (std::list<string>::const_iterator it = strs.begin(); it != strs.end(); it++) Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Thu Feb 26 14:48:12 2009 @@ -21,20 +21,19 @@ enum OutputStream { IDX_STDOUT, IDX_STDERR }; - SystemCmd( const char* Command_Cv ); - SystemCmd( const string& Command_Cv ); + SystemCmd(const string& Command_Cv); SystemCmd(); virtual ~SystemCmd(); - int execute( const string& Command_Cv ); - int executeBackground( const string& Command_Cv ); - int executeRestricted( const string& Command_Cv, - unsigned long MaxTimeSec, unsigned long MaxLineOut, - bool& ExceedTime, bool& ExceedLines); + int execute(const string& Command_Cv); + int executeBackground(const string& Command_Cv); + int executeRestricted(const string& Command_Cv, + unsigned long MaxTimeSec, unsigned long MaxLineOut, + bool& ExceedTime, bool& ExceedLines); + + void setOutputProcessor(OutputProcessor* proc) { output_proc = proc; } - void setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ); - void setOutputProcessor( OutputProcessor * proc ) { output_proc = proc; } void logOutput() const; string stderr() const { return getString(IDX_STDERR); } @@ -42,7 +41,7 @@ string cmd() const { return lastCmd; } int retcode() const { return Ret_i; } - int select(string Reg_Cv, bool Invert_bv = false, OutputStream Idx_ii = IDX_STDOUT); + int select(const string& Reg_Cv, bool Invert_bv = false, OutputStream Idx_ii = IDX_STDOUT); unsigned numLines(bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; string getLine(unsigned Num_iv, bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; @@ -64,14 +63,14 @@ void invalidate(); void closeOpenFds(); - int doExecute( string Cmd_Cv ); - bool doWait( bool Hang_bv, int& Ret_ir ); + int doExecute(const string& Cmd_Cv); + bool doWait(bool Hang_bv, int& Ret_ir); void checkOutput(); - void getUntilEOF( FILE* File_Cr, std::vector<string>& Lines_Cr, - bool& NewLineSeen_br, bool Stderr_bv ); - void extractNewline( const char* Buf_ti, int Cnt_ii, bool& NewLineSeen_br, - string& Text_Cr, std::vector<string>& Lines_Cr ); - void addLine( string Text_Cv, std::vector<string>& Lines_Cr ); + void getUntilEOF(FILE* File_Cr, std::vector<string>& Lines_Cr, + bool& NewLineSeen_br, bool Stderr_bv); + void extractNewline(const string& Buf_ti, int Cnt_ii, bool& NewLineSeen_br, + string& Text_Cr, std::vector<string>& Lines_Cr); + void addLine(const string& Text_Cv, std::vector<string>& Lines_Cr); void init(); string getString(OutputStream Idx_ii = IDX_STDOUT) const; @@ -85,8 +84,6 @@ string lastCmd; int Ret_i; int Pid_i; - void (* OutputHandler_f)( void*, string, bool ); - void *HandlerPar_p; OutputProcessor* output_proc; struct pollfd pfds[2]; -- 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] r55790 - in /trunk/sound: data/addons/mixer.ycp data/sndcards.ycp package/yast2-sound.changes sound/src/Sound.ycp sound/src/volume.ycp
by lslezak＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: lslezak Date: Thu Feb 26 14:20:05 2009 New Revision: 55790 URL: http://svn.opensuse.org/viewcvs/yast?rev=55790&view=rev Log: - set 100% volume for snd-hda-intel driver (bnc#477853), (bnc#466428) Modified: trunk/sound/data/addons/mixer.ycp trunk/sound/data/sndcards.ycp trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/volume.ycp Modified: trunk/sound/data/addons/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/addons/mixer.ycp?rev=… ============================================================================== --- trunk/sound/data/addons/mixer.ycp (original) +++ trunk/sound/data/addons/mixer.ycp Thu Feb 26 14:20:05 2009 @@ -34,6 +34,16 @@ "Wave": 100, "Music": 100 ] - ] - + ], + "snd-hda-intel": + $[ + "mixer": + $[ + "Front": 100, + "Surround": 100, + "Center": 100, + "LFE": 100, + "PCM": 100, + ] + ], ] Modified: trunk/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/sndcards.ycp?rev=5579… ============================================================================== --- trunk/sound/data/sndcards.ycp (original) +++ trunk/sound/data/sndcards.ycp Thu Feb 26 14:20:05 2009 @@ -2390,6 +2390,13 @@ ], "snd-hda-intel" : $[ "description" : "Intel HDA driver", + "mixer" : $[ + "Center" : 100, + "Front" : 100, + "LFE" : 100, + "Surround" : 100, + "PCM" : 100 + ], "params" : $[ "model" : $[ "descr" : _("Use the given board model.") Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Thu Feb 26 14:20:05 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz + +- set 100% volume for snd-hda-intel driver (bnc#477853), + (bnc#466428) + +------------------------------------------------------------------- Wed Jan 28 10:04:59 CET 2009 - lslezak(a)suse.cz - do not restore volume settings at start up (bnc#466456) Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=55… ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Thu Feb 26 14:20:05 2009 @@ -1363,7 +1363,12 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "iSpeaker":70 ]; + + map devs = db_modules[modname, "mixer"]: + $["Master":default_volume, "PCM":default_volume, "CD":default_volume, + "Synth":default_volume, "Front":default_volume, "Headphone":default_volume, + "Master Mono":default_volume, "iSpeaker":default_volume ]; + y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list @@ -1373,7 +1378,12 @@ foreach (list channel, volume_settings[c_id]:[], ``{ y2debug("devs: %1", devs); y2debug("channel: %1", channel); - devs = add (devs, channel[0]:"Master", channel[1]:70); + + // do not rewrite the values from DB + if (!haskey(devs, channel[0]:"Master")) + { + devs = add (devs, channel[0]:"Master", channel[1]:default_volume); + } }); } y2milestone("Mixer devices after merge: %1", devs); Modified: trunk/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/volume.ycp?rev=5… ============================================================================== --- trunk/sound/sound/src/volume.ycp (original) +++ trunk/sound/sound/src/volume.ycp Thu Feb 26 14:20:05 2009 @@ -370,25 +370,27 @@ string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; setVolume (master_elem, card_id, Sound::default_volume); - setVolume ("Headphone", card_id, Sound::default_volume); - setVolume ("Front", card_id, Sound::default_volume); map devs = Sound::db_modules[modname, "mixer"]:$[]; + + setVolume ("Headphone", card_id, devs["Headphone"]:Sound::default_volume); + setVolume ("Front", card_id, devs["Front"]:Sound::default_volume); + if (haskey (devs, "PCM")) { - setVolume ("PCM", card_id, Sound::default_volume); + setVolume ("PCM", card_id, devs["PCM"]:Sound::default_volume); } if (haskey (devs, "Master Mono")) { - setVolume ("Master Mono", card_id, Sound::default_volume); + setVolume ("Master Mono", card_id, devs["Master Mono"]:Sound::default_volume); } if (haskey (devs, "iSpeaker")) { - setVolume ("iSpeaker", card_id, Sound::default_volume); + setVolume ("iSpeaker", card_id, devs["iSpeaker"]:Sound::default_volume); } if (haskey (devs, "Speaker")) { - setVolume ("Speaker", card_id, Sound::default_volume); + setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } -- 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] r55789 - /tags/branch-Code-11-2_17_15/sound/
by lslezak＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: lslezak Date: Thu Feb 26 14:09:53 2009 New Revision: 55789 URL: http://svn.opensuse.org/viewcvs/yast?rev=55789&view=rev Log: Created tag branch-Code-11-2_17_15 for sound Added: tags/branch-Code-11-2_17_15/sound/ - copied from r55788, branches/SuSE-Code-11-Branch/sound/ -- 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] r55788 - in /branches/SuSE-Code-11-Branch/sound: VERSION data/addons/mixer.ycp data/sndcards.ycp package/yast2-sound.changes sound/src/Sound.ycp sound/src/volume.ycp
by lslezak＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: lslezak Date: Thu Feb 26 14:09:44 2009 New Revision: 55788 URL: http://svn.opensuse.org/viewcvs/yast?rev=55788&view=rev Log: - set 100% volume for snd-hda-intel driver (bnc#477853), (bnc#466428) - 2.17.15 Modified: branches/SuSE-Code-11-Branch/sound/VERSION branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp Modified: branches/SuSE-Code-11-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/VERSION (original) +++ branches/SuSE-Code-11-Branch/sound/VERSION Thu Feb 26 14:09:44 2009 @@ -1 +1 @@ -2.17.14 +2.17.15 Modified: branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/dat… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/data/addons/mixer.ycp Thu Feb 26 14:09:44 2009 @@ -34,6 +34,16 @@ "Wave": 100, "Music": 100 ] - ] - + ], + "snd-hda-intel": + $[ + "mixer": + $[ + "Front": 100, + "Surround": 100, + "Center": 100, + "LFE": 100, + "PCM": 100, + ] + ], ] Modified: branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/dat… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/data/sndcards.ycp Thu Feb 26 14:09:44 2009 @@ -2390,6 +2390,13 @@ ], "snd-hda-intel" : $[ "description" : "Intel HDA driver", + "mixer" : $[ + "Center" : 100, + "Front" : 100, + "LFE" : 100, + "Surround" : 100, + "PCM" : 100 + ], "params" : $[ "model" : $[ "descr" : _("Use the given board model.") Modified: branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-Branch/sound/package/yast2-sound.changes Thu Feb 26 14:09:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 26 12:49:21 CET 2009 - lslezak(a)suse.cz + +- set 100% volume for snd-hda-intel driver (bnc#477853), + (bnc#466428) +- 2.17.15 + +------------------------------------------------------------------- Fri Jan 9 15:55:15 CET 2009 - lslezak(a)suse.cz - fixed snd slots option for snd-aoa driver (PPC) (bnc#460338) Modified: branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/sou… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/Sound.ycp Thu Feb 26 14:09:44 2009 @@ -1411,7 +1411,12 @@ */ global define void InitMixer(integer c_id, string modname) ``{ y2milestone("InitMixer: %1, %2", c_id, modname); - map devs = db_modules[modname, "mixer"]:$["Master":70, "PCM":70, "CD":70, "Synth":70, "Front":70, "Headphone":70, "Master Mono":70, "iSpeaker":70 ]; + + map devs = db_modules[modname, "mixer"]: + $["Master":default_volume, "PCM":default_volume, "CD":default_volume, + "Synth":default_volume, "Front":default_volume, "Headphone":default_volume, + "Master Mono":default_volume, "iSpeaker":default_volume ]; + y2milestone("Mixer devices: %1", devs); // now let's merge settings from volume_settings list @@ -1421,7 +1426,12 @@ foreach (list channel, volume_settings[c_id]:[], ``{ y2debug("devs: %1", devs); y2debug("channel: %1", channel); - devs = add (devs, channel[0]:"Master", channel[1]:70); + + // do not rewrite the values from DB + if (!haskey(devs, channel[0]:"Master")) + { + devs = add (devs, channel[0]:"Master", channel[1]:default_volume); + } }); } y2milestone("Mixer devices after merge: %1", devs); Modified: branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sound/sou… ============================================================================== --- branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp (original) +++ branches/SuSE-Code-11-Branch/sound/sound/src/volume.ycp Thu Feb 26 14:09:44 2009 @@ -370,25 +370,27 @@ string master_elem = Sound::db_modules[modname, "main_volume"]:"Master"; setVolume (master_elem, card_id, Sound::default_volume); - setVolume ("Headphone", card_id, Sound::default_volume); - setVolume ("Front", card_id, Sound::default_volume); map devs = Sound::db_modules[modname, "mixer"]:$[]; + + setVolume ("Headphone", card_id, devs["Headphone"]:Sound::default_volume); + setVolume ("Front", card_id, devs["Front"]:Sound::default_volume); + if (haskey (devs, "PCM")) { - setVolume ("PCM", card_id, Sound::default_volume); + setVolume ("PCM", card_id, devs["PCM"]:Sound::default_volume); } if (haskey (devs, "Master Mono")) { - setVolume ("Master Mono", card_id, Sound::default_volume); + setVolume ("Master Mono", card_id, devs["Master Mono"]:Sound::default_volume); } if (haskey (devs, "iSpeaker")) { - setVolume ("iSpeaker", card_id, Sound::default_volume); + setVolume ("iSpeaker", card_id, devs["iSpeaker"]:Sound::default_volume); } if (haskey (devs, "Speaker")) { - setVolume ("Speaker", card_id, Sound::default_volume); + setVolume ("Speaker", card_id, devs["Speaker"]:Sound::default_volume); } -- 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] r55787 - in /trunk/storage/libstorage/src: AppUtil.cc Dasd.cc Disk.cc Dm.cc DmCo.cc DmmultipathCo.cc DmraidCo.cc LvmLv.cc LvmVg.cc Md.cc ProcMounts.cc Storage.cc SystemCmd.cc SystemCmd.h Volume.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 12:27:26 2009 New Revision: 55787 URL: http://svn.opensuse.org/viewcvs/yast?rev=55787&view=rev Log: - some SystemCmd cleanup: - use enum instead of int in interface - make function return string instead of pointer/reference to string - other minor issues Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Dm.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmmultipathCo.cc trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/LvmLv.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/Md.cc trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/SystemCmd.cc trunk/storage/libstorage/src/SystemCmd.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Feb 26 12:27:26 2009 @@ -508,7 +508,7 @@ SystemCmd c( cmd ); if( c.numLines()>0 ) { - extractNthWord( 0, *c.getLine(0)) >> ret; + extractNthWord( 0, c.getLine(0)) >> ret; } y2mil( "driver:" << driver << " ret:" << ret ); return( ret ); Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Thu Feb 26 12:27:26 2009 @@ -61,7 +61,7 @@ { if( Cmd.select( "^format" )>0 ) { - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); y2milestone( "Format line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = boost::to_lower_copy(extractNthWord(4, tmp), locale::classic()); @@ -171,7 +171,7 @@ unsigned long c_start; unsigned long c_size; - line = *cmd.getLine(i); + line = cmd.getLine(i); tmp = extractNthWord( 0, line ); if( part.match(tmp) ) { @@ -234,7 +234,7 @@ if( cmd.select( "cylinders" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Cylinder line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); @@ -245,7 +245,7 @@ if( cmd.select( "tracks per" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Tracks line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); @@ -256,7 +256,7 @@ if( cmd.select( "blocks per" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Blocks line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); @@ -267,7 +267,7 @@ if( cmd.select( "blocksize" )>0 ) { val = 0; - tmp = *cmd.getLine(0, true); + tmp = cmd.getLine(0, true); y2milestone( "Bytes line:%s", tmp.c_str() ); tmp = tmp.erase( 0, tmp.find( ':' ) + 1 ); tmp = extractNthWord( 3, tmp ); Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Feb 26 12:27:26 2009 @@ -381,13 +381,13 @@ checkSystemError( cmd_line, Cmd ); if( Cmd.select( "Partition Table:" )>0 ) { - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); y2mil("Label line:" << tmp); dlabel = extractNthWord( 2, tmp ); } if( Cmd.select( "BIOS cylinder" )>0 ) { - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); getGeometry( tmp, cyl, head, sector ); new_cyl = cyl; new_head = head; @@ -791,7 +791,7 @@ unsigned id; bool boot; - line = *Cmd.getLine(i); + line = Cmd.getLine(i); tmp = extractNthWord( 0, line ); if( tmp.length()>0 && isdigit(tmp[0]) ) { @@ -1946,7 +1946,7 @@ unsigned long c; unsigned h; unsigned s; - string tmp = *Cmd.getLine(0, true); + string tmp = Cmd.getLine(0, true); getGeometry( tmp, c, h, s ); if( c!=0 && c!=cyl ) { @@ -2065,8 +2065,7 @@ PartitionType type; bool boot; if( cmd.numLines()>0 && - scanPartedLine( *cmd.getLine(0), nr, start, csize, type, - id, boot )) + scanPartedLine( cmd.getLine(0), nr, start, csize, type, id, boot )) { y2milestone( "really created at cyl:%ld csize:%ld", start, csize ); p->changeRegion( start, csize, cylinderToKb(csize) ); @@ -2110,7 +2109,7 @@ if( cmd.numLines()>0 ) { string dummy, s1, s2; - std::istringstream data( *cmd.getLine(0) ); + std::istringstream data( cmd.getLine(0) ); classic(data); data >> dummy >> s1 >> s2; y2milestone( "dummy:\"%s\" s1:\"%s\" s2:\"%s\"", dummy.c_str(), Modified: trunk/storage/libstorage/src/Dm.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dm.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Dm.cc (original) +++ trunk/storage/libstorage/src/Dm.cc Thu Feb 26 12:27:26 2009 @@ -63,7 +63,7 @@ " inactive:" << inactiv); if( c.numLines()>0 ) { - string line = *c.getLine(0); + string line = c.getLine(0); target = extractNthWord( 2, line ); if( target=="striped" ) extractNthWord( 3, line ) >> stripe; @@ -77,7 +77,7 @@ unsigned long le; string dev; string majmin; - string line = *c.getLine(i); + string line = c.getLine(i); if( target=="linear" ) { extractNthWord( 1, line ) >> le; @@ -209,17 +209,17 @@ " -m " + *(++ls.begin()) + " | sed -e \"s/:.*//\"" ); if( c.retcode()==0 && c.numLines()>0 ) { - string tmp = "/dev/"+*c.getLine(0); + string tmp = "/dev/" + c.getLine(0); if( cont->getStorage()->knownDevice( tmp, true ) ) { ret = tmp; } else { - c.execute(DMSETUPBIN " table " + quote(*c.getLine(0))); + c.execute(DMSETUPBIN " table " + quote(c.getLine(0))); if( c.retcode()==0 && c.numLines()>0 ) { - pair = extractNthWord( 3, *c.getLine(0) ); + pair = extractNthWord( 3, c.getLine(0) ); ret = cont->getStorage()->deviceByNumber( pair ); } } @@ -494,7 +494,7 @@ SystemCmd c(DMSETUPBIN " -c --noheadings info " + quote(table)); if( c.retcode()==0 && c.numLines()>0 ) { - list<string> sl = splitString( *c.getLine(0), ":" ); + list<string> sl = splitString( c.getLine(0), ":" ); if( sl.size()>=3 ) { list<string>::const_iterator ci = sl.begin(); Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Thu Feb 26 12:27:26 2009 @@ -83,7 +83,7 @@ string cipher, keysize; for( unsigned int i = 0; i < c.numLines(); i++) { - string line = *c.getLine(i); + string line = c.getLine(i); string key = extractNthWord( 0, line ); if( key == "cipher:" ) cipher = extractNthWord( 1, line ); @@ -118,7 +118,7 @@ SystemCmd c(DMSETUPBIN " ls | grep \"(.*)\"" ); for( unsigned i=0; i<c.numLines(); ++i ) { - string line = *c.getLine(i); + string line = c.getLine(i); string table = extractNthWord( 0, line ); bool found=false; Storage::ConstLvmLvIterator i=lv.begin(); Modified: trunk/storage/libstorage/src/DmmultipathCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dmmultipa… ============================================================================== --- trunk/storage/libstorage/src/DmmultipathCo.cc (original) +++ trunk/storage/libstorage/src/DmmultipathCo.cc Thu Feb 26 12:27:26 2009 @@ -41,7 +41,7 @@ if (c.numLines() > 0) { - string line = *c.getLine(0); + string line = c.getLine(0); y2mil("mp line:" << line); string unit = extractNthWord(0, line); @@ -63,7 +63,7 @@ list<string> devs; for (unsigned int i = 1; i < c.numLines(); i++) { - string line = *c.getLine(i); + string line = c.getLine(i); if (boost::starts_with(line, " \\_")) { y2mil("mp element:" << line); @@ -168,12 +168,12 @@ unsigned i=0; if( i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); while( i<c.numLines() ) { while( i<c.numLines() && (line.empty() || !isalnum(line[0]))) if( ++i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); y2mil("mp line:" << line); @@ -183,7 +183,7 @@ list<string> mp_list; if( ++i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); while( i<c.numLines() && (line.empty() || !isalnum(line[0]))) { if (boost::starts_with(line, " \\_")) @@ -194,7 +194,7 @@ mp_list.push_back(dev); } if( ++i<c.numLines() ) - line = *c.getLine(i); + line = c.getLine(i); } y2mil( "mp_list:" << mp_list ); if (mp_list.size() >= 1) Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Thu Feb 26 12:27:26 2009 @@ -38,7 +38,7 @@ list<string>::const_iterator ci; list<string> sl; if( c.numLines()>0 ) - sl = splitString( *c.getLine(0), ":" ); + sl = splitString( c.getLine(0), ":" ); Pv *pve = new Pv; if( sl.size()>=4 ) { @@ -49,7 +49,7 @@ unsigned num = 1; while( num<c.numLines() ) { - sl = splitString( *c.getLine(num), ":" ); + sl = splitString( c.getLine(num), ":" ); y2mil( "sl:" << sl ); if( sl.size()>=3 ) { @@ -133,7 +133,7 @@ SystemCmd c(DMRAIDBIN " -s -c -c -c"); for( unsigned i=0; i<c.numLines(); ++i ) { - list<string> sl = splitString( *c.getLine(i), ":" ); + list<string> sl = splitString( c.getLine(i), ":" ); if( sl.size()>=3 ) { list<string>::const_iterator ci = sl.begin(); Modified: trunk/storage/libstorage/src/LvmLv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmLv.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmLv.cc (original) +++ trunk/storage/libstorage/src/LvmLv.cc Thu Feb 26 12:27:26 2009 @@ -114,7 +114,7 @@ { for (unsigned int l = 1; l < cmd.numLines(); l++) { - string line = *cmd.getLine(l); + string line = cmd.getLine(l); if (extractNthWord(0, line) == name()) { Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Thu Feb 26 12:27:26 2009 @@ -641,10 +641,10 @@ string::size_type pos; while( i<cnt ) { - line = *c.getLine( i++ ); + line = c.getLine( i++ ); if( line.find( "Volume group" )!=string::npos ) { - line = *c.getLine( i++ ); + line = c.getLine( i++ ); while( line.find( "Logical volume" )==string::npos && line.find( "Physical volume" )==string::npos && i<cnt ) @@ -689,7 +689,7 @@ { uuid = extractNthWord( 2, line ); } - line = *c.getLine( i++ ); + line = c.getLine( i++ ); } string vname; string origin; @@ -747,7 +747,7 @@ { uuid = extractNthWord( 2, line ); } - line = *c.getLine( i++ ); + line = c.getLine( i++ ); } if( !vname.empty() ) { @@ -778,7 +778,7 @@ extractNthWord( 5, line ) >> p->num_pe; extractNthWord( 7, line ) >> p->free_pe; } - line = *c.getLine( i++ ); + line = c.getLine( i++ ); } if( !p->device.empty() ) { @@ -1124,7 +1124,7 @@ for( unsigned i=0; i<c.numLines(); ++i ) { - string vgname = *c.getLine(i); + string vgname = c.getLine(i); string::size_type pos=vgname.find_first_not_of( app_ws+"\"" ); if( pos>0 ) vgname.erase( 0, pos ); @@ -1537,7 +1537,7 @@ c.execute( "devmap_name "+dm+":"+i->device.substr( 8 ) ); if( c.retcode()==0 ) { - string dev = "/dev/" + *c.getLine( 0 ); + string dev = "/dev/" + c.getLine( 0 ); y2mil( "dev:" << i->device << " normal dev:" << dev ); if( getStorage()->knownDevice( dev ) ) { Modified: trunk/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Md.cc?rev… ============================================================================== --- trunk/storage/libstorage/src/Md.cc (original) +++ trunk/storage/libstorage/src/Md.cc Thu Feb 26 12:27:26 2009 @@ -49,21 +49,21 @@ string::size_type pos; if( c.retcode()==0 && c.numLines(true)>0 ) { - md_uuid = *c.getLine(0,true); + md_uuid = c.getLine(0,true); if( (pos=md_uuid.find( "UUID : " ))!=string::npos ) md_uuid.erase( 0, pos+7 ); md_uuid = extractNthWord( 0, md_uuid ); } c.select( "Version : " ); if( c.retcode()==0 && c.numLines(true)>0 ) - sb_ver = extractNthWord( 2, *c.getLine(0,true) ); + sb_ver = extractNthWord( 2, c.getLine(0,true) ); if (c.retcode()==0 && c.numLines(true)>0 ) { - y2mil( "line:\"" << *c.getLine(0,true) << "\"" ); + y2mil( "line:\"" << c.getLine(0,true) << "\"" ); y2mil( "sb_ver:\"" << sb_ver << "\"" ); - y2mil( "word0:\"" << extractNthWord( 0, *c.getLine(0,true)) << "\"" ); - y2mil( "word1:\"" << extractNthWord( 1, *c.getLine(0,true)) << "\"" ); - y2mil( "word2:\"" << extractNthWord( 2, *c.getLine(0,true)) << "\"" ); + y2mil( "word0:\"" << extractNthWord( 0, c.getLine(0,true)) << "\"" ); + y2mil( "word1:\"" << extractNthWord( 1, c.getLine(0,true)) << "\"" ); + y2mil( "word2:\"" << extractNthWord( 2, c.getLine(0,true)) << "\"" ); } string tmp; string line = line1; @@ -260,7 +260,7 @@ c.select("State : "); if( c.retcode()==0 && c.numLines(true)>0 ) { - string state = *c.getLine(0,true); + string state = c.getLine(0,true); string::size_type pos; if( (pos=state.find( "State : " ))!=string::npos ) state.erase( 0, pos+8 ); Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMount… ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Thu Feb 26 12:27:26 2009 @@ -56,7 +56,7 @@ mt.select( (string)" on "+dir+' ' ); if( mt.numLines(true)>0 ) { - list<string> sl = splitString( *mt.getLine(0,true) ); + list<string> sl = splitString( mt.getLine(0,true) ); y2mil( "sl:" << sl ); if( sl.size()>=6 ) { @@ -93,8 +93,8 @@ mt.select( " / " ); if( mt.numLines()>0 ) { - y2mil( "root mount:" << *mt.getLine(0,true) ); - string dev = extractNthWord( 0, *mt.getLine(0,true)); + y2mil( "root mount:" << mt.getLine(0,true) ); + string dev = extractNthWord( 0, mt.getLine(0,true)); if( !dev.empty() && dev[0]!='/' ) { dev = sto->findNormalDevice( dev ); Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Feb 26 12:27:26 2009 @@ -225,7 +225,7 @@ if( testmode ) { - SystemCmd::testmode = true; + SystemCmd::setTestmode(); rootprefix = testdir; fstab = new EtcFstab( rootprefix ); string t = testdir+"/volume_info"; @@ -250,7 +250,7 @@ SystemCmd rm; for( unsigned i=0; i<c.numLines(); i++ ) { - rm.execute(MDADMBIN " --stop " + quote("/dev/" + extractNthWord(0, *c.getLine(i)))); + rm.execute(MDADMBIN " --stop " + quote("/dev/" + extractNthWord(0, c.getLine(i)))); } } delete ppart; @@ -848,8 +848,7 @@ SystemCmd c("/usr/bin/md5sum " + quote(n1) + " " + quote(n2)); if( c.retcode()==0 && c.numLines()>=2 ) { - ret = extractNthWord( 0, *c.getLine(0) )== - extractNthWord( 0, *c.getLine(1) ); + ret = extractNthWord( 0, c.getLine(0) ) == extractNthWord( 0, c.getLine(1) ); } } y2mil("ret:" << ret << "n1:" << n1 << " n2:" << n2); @@ -3725,7 +3724,7 @@ SystemCmd c( "ps ax | grep -w /usr/sbin/hald | grep -v grep" ); if( c.numLines()>0 ) { - extractNthWord( 0, *c.getLine(0) ) >> hald_pid; + extractNthWord( 0, c.getLine(0) ) >> hald_pid; y2mil( "hald_pid:" << hald_pid ); } if( hald_pid>0 ) @@ -4575,7 +4574,7 @@ unsigned line=0; while( line<c.numLines() ) { - removeDmTable( *c.getLine(line) ); + removeDmTable( c.getLine(line) ); line++; } } @@ -5444,12 +5443,13 @@ SystemCmd c("/usr/sbin/ntfsresize -f -i " + quote(device)); string fstr = " might resize at "; string::size_type pos; - if (c.retcode()==0 && (pos=c.stdout().find(fstr))!=string::npos) + string stdout = c.stdout(); + if (c.retcode()==0 && (pos=stdout.find(fstr))!=string::npos) { y2mil("pos:" << pos); - pos = c.stdout().find_first_not_of(" \t\n", pos + fstr.size()); + pos = stdout.find_first_not_of(" \t\n", pos + fstr.size()); y2mil("pos:" << pos); - string number = c.stdout().substr(pos, c.stdout().find_first_not_of("0123456789", pos)); + string number = stdout.substr(pos, stdout.find_first_not_of("0123456789", pos)); y2mil("number:\"" << number << "\""); unsigned long long t; number >> t; Modified: trunk/storage/libstorage/src/SystemCmd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.cc (original) +++ trunk/storage/libstorage/src/SystemCmd.cc Thu Feb 26 12:27:26 2009 @@ -29,6 +29,7 @@ execute( Command ); } + SystemCmd::SystemCmd( const string& Command_Cv ) { y2mil("constructor SystemCmd:\"" << Command_Cv << "\""); @@ -36,12 +37,14 @@ execute( Command_Cv ); } + SystemCmd::SystemCmd() { y2mil("constructor SystemCmd"); init(); } + void SystemCmd::init() { Combine_b = false; @@ -52,6 +55,7 @@ pfds[0].events = pfds[1].events = POLLIN; } + SystemCmd::~SystemCmd() { if( File_aC[IDX_STDOUT] ) @@ -60,14 +64,15 @@ fclose( File_aC[IDX_STDERR] ); } + void -SystemCmd::setOutputHandler( void (*Handle_f)( void *, string, bool ), - void * Par_p ) +SystemCmd::setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ) { OutputHandler_f = Handle_f; HandlerPar_p = Par_p; } + void SystemCmd::closeOpenFds() { @@ -99,8 +104,7 @@ int SystemCmd::executeRestricted( const string& Command_Cv, - long unsigned MaxTimeSec, - long unsigned MaxLineOut, + long unsigned MaxTimeSec, long unsigned MaxLineOut, bool& ExceedTime, bool& ExceedLines ) { y2mil("cmd:" << Command_Cv << " MaxTime:" << MaxTimeSec << " MaxLines:" << MaxLineOut); @@ -349,29 +353,34 @@ return Wait_ii != 0; } + void -SystemCmd::setCombine( const bool Comb_bv ) - { - Combine_b = Comb_bv; - } +SystemCmd::setCombine(bool val) +{ + Combine_b = val; +} -const string * -SystemCmd::getString( unsigned Idx_iv ) const + +void +SystemCmd::setTestmode(bool val) +{ + testmode = val; +} + + +string +SystemCmd::getString( OutputStream Idx_iv ) const { if( Idx_iv > 1 ) { y2err("invalid index " << Idx_iv); } - if( !Valid_ab[Idx_iv] ) - { - Text_aC[Idx_iv] = boost::join(Lines_aC[Idx_iv], "\n"); - Valid_ab[Idx_iv] = true; - } - return &Text_aC[Idx_iv]; + return boost::join(Lines_aC[Idx_iv], "\n"); } + unsigned -SystemCmd::numLines( bool Sel_bv, unsigned Idx_iv ) const +SystemCmd::numLines( bool Sel_bv, OutputStream Idx_iv ) const { unsigned Ret_ii; @@ -391,10 +400,11 @@ return Ret_ii; } -const string * -SystemCmd::getLine( unsigned Nr_iv, bool Sel_bv, unsigned Idx_iv ) const + +string +SystemCmd::getLine( unsigned Nr_iv, bool Sel_bv, OutputStream Idx_iv ) const { - const string * Ret_pCi = NULL; + string ret; if( Idx_iv > 1 ) { @@ -404,21 +414,22 @@ { if( Nr_iv < SelLines_aC[Idx_iv].capacity() ) { - Ret_pCi = SelLines_aC[Idx_iv][Nr_iv]; + ret = *SelLines_aC[Idx_iv][Nr_iv]; } } else { if( Nr_iv < Lines_aC[Idx_iv].size() ) { - Ret_pCi = &Lines_aC[Idx_iv][Nr_iv]; + ret = Lines_aC[Idx_iv][Nr_iv]; } } - return Ret_pCi; + return ret; } + int -SystemCmd::select( string Pat_Cv, bool Invert_bv, unsigned Idx_iv ) +SystemCmd::select( string Pat_Cv, bool Invert_bv, OutputStream Idx_iv ) { int I_ii; int End_ii; @@ -460,14 +471,12 @@ return Size_ii; } + void SystemCmd::invalidate() { - int Idx_ii; - - for( Idx_ii=0; Idx_ii<2; Idx_ii++ ) + for (int Idx_ii = 0; Idx_ii < 2; Idx_ii++) { - Valid_ab[Idx_ii] = false; SelLines_aC[Idx_ii].resize(0); Lines_aC[Idx_ii].clear(); NewLineSeen_ab[Idx_ii] = true; @@ -559,6 +568,7 @@ } } + void SystemCmd::extractNewline( const char* Buf_ti, int Cnt_iv, bool& NewLine_br, string& Text_Cr, vector<string>& Lines_Cr ) @@ -603,9 +613,9 @@ SystemCmd::logOutput() const { for (unsigned i = 0; i < numLines(false, IDX_STDERR); ++i) - y2mil("stderr:" << *getLine(i, false, IDX_STDERR)); + y2mil("stderr:" << getLine(i, false, IDX_STDERR)); for (unsigned i = 0; i < numLines(false, IDX_STDOUT); ++i) - y2mil("stdout:" << *getLine(i, false, IDX_STDOUT)); + y2mil("stdout:" << getLine(i, false, IDX_STDOUT)); } Modified: trunk/storage/libstorage/src/SystemCmd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/SystemCmd… ============================================================================== --- trunk/storage/libstorage/src/SystemCmd.h (original) +++ trunk/storage/libstorage/src/SystemCmd.h Thu Feb 26 12:27:26 2009 @@ -18,33 +18,38 @@ class SystemCmd { public: + enum OutputStream { IDX_STDOUT, IDX_STDERR }; + SystemCmd( const char* Command_Cv ); SystemCmd( const string& Command_Cv ); SystemCmd(); + virtual ~SystemCmd(); + int execute( const string& Command_Cv ); int executeBackground( const string& Command_Cv ); int executeRestricted( const string& Command_Cv, - unsigned long MaxTimeSec, - unsigned long MaxLineOut, + unsigned long MaxTimeSec, unsigned long MaxLineOut, bool& ExceedTime, bool& ExceedLines); - void setOutputHandler( void (*Handle_f)( void *, string, bool ), - void * Par_p ); + + void setOutputHandler( void (*Handle_f)( void *, string, bool ), void * Par_p ); + void setOutputProcessor( OutputProcessor * proc ) { output_proc = proc; } void logOutput() const; - void setOutputProcessor( OutputProcessor * proc ) - { output_proc = proc; } - int select( string Reg_Cv, bool Invert_bv=false, - unsigned Idx_ii=IDX_STDOUT ); - const string& stderr() const { return( *getString(IDX_STDERR)); } - const string& stdout() const { return( *getString(IDX_STDOUT)); } - const string& cmd() const { return( lastCmd ); } - const string* getLine( unsigned Num_iv, bool Selected_bv=false, - unsigned Idx_ii=IDX_STDOUT ) const; - unsigned numLines( bool Selected_bv=false, unsigned Idx_ii=IDX_STDOUT ) const; - void setCombine( const bool Combine_b=true ); + + string stderr() const { return getString(IDX_STDERR); } + string stdout() const { return getString(IDX_STDOUT); } + string cmd() const { return lastCmd; } int retcode() const { return Ret_i; } + int select(string Reg_Cv, bool Invert_bv = false, OutputStream Idx_ii = IDX_STDOUT); + unsigned numLines(bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; + string getLine(unsigned Num_iv, bool Selected_bv = false, OutputStream Idx_ii = IDX_STDOUT) const; + + void setCombine(bool combine = true); + + static void setTestmode(bool testmode = true); + /** * Quotes and protects a single string for shell execution. */ @@ -55,8 +60,6 @@ */ static string quote(const std::list<string>& strs); - static bool testmode; - protected: void invalidate(); @@ -71,10 +74,8 @@ void addLine( string Text_Cv, std::vector<string>& Lines_Cr ); void init(); - const string* getString( unsigned Idx_ii=IDX_STDOUT ) const; + string getString(OutputStream Idx_ii = IDX_STDOUT) const; - mutable string Text_aC[2]; - mutable bool Valid_ab[2]; FILE* File_aC[2]; std::vector<string> Lines_aC[2]; std::vector<string*> SelLines_aC[2]; @@ -89,6 +90,8 @@ OutputProcessor* output_proc; struct pollfd pfds[2]; + static bool testmode; + }; Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Feb 26 12:27:26 2009 @@ -347,7 +347,7 @@ } if( found ) { - list<string> l = splitString( *loopData.getLine( 0, true )); + list<string> l = splitString( loopData.getLine( 0, true )); std::ostringstream b; classic(b); b << "line[" << device() << "]=" << l; @@ -400,7 +400,7 @@ } if( found ) { - list<string> l = splitString( *blkidData.getLine( 0, true ), " \t\n", + list<string> l = splitString( blkidData.getLine( 0, true ), " \t\n", true, true, "\"" ); std::ostringstream b; classic(b); -- 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] r55786 - /tags/branch-Code-11-2_17_74/network/
by jsrain＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsrain Date: Thu Feb 26 12:13:13 2009 New Revision: 55786 URL: http://svn.opensuse.org/viewcvs/yast?rev=55786&view=rev Log: Created tag branch-Code-11-2_17_74 for network Added: tags/branch-Code-11-2_17_74/network/ - copied from r55785, branches/SuSE-Code-11-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] r55785 - /tags/branch-Code-11-2_17_74/
by jsrain＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsrain Date: Thu Feb 26 12:13:11 2009 New Revision: 55785 URL: http://svn.opensuse.org/viewcvs/yast?rev=55785&view=rev Log: Created tag branch-Code-11-2_17_74 Added: tags/branch-Code-11-2_17_74/ -- 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] r55784 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by jsrain＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: jsrain Date: Thu Feb 26 12:12:35 2009 New Revision: 55784 URL: http://svn.opensuse.org/viewcvs/yast?rev=55784&view=rev Log: store HW address only for L2 qeth devices (bnc #479481) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Thu Feb 26 12:12:35 2009 @@ -1 +1 @@ -2.17.73 +2.17.74 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Thu Feb 26 12:12:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 26 12:07:25 CET 2009 - jsrain(a)suse.cz + +- store HW address only for L2 qeth devices (bnc #479481) +- 2.17.74 + +------------------------------------------------------------------- Wed Feb 25 14:47:29 CET 2009 - jsrain(a)suse.cz - do not store HW address into sysconfig on hsi and some qeth Modified: branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/clients/save_network.ycp Thu Feb 26 12:12:35 2009 @@ -125,13 +125,8 @@ // hsi devices do not support setting hwaddr (bnc #479481) if (InstallInf["type"]:"" == "hsi" && haskey (InstallInf, "hwaddr")) InstallInf = remove (InstallInf, "hwaddr"); - // do not set MAC address of device if it is the same as of an existing device (bnc #479481) - list<string> known_hwaddr = []; - foreach (map c, (list<map>)SCR::Read (.probe.netcard), { - list hwaddr = maplist (map m, c["resource", "hwaddr"]:[], { return m["addr"]:""; }); - known_hwaddr = (list<string>)merge (known_hwaddr, hwaddr); - }); - if (InstallInf["type"]:"" == "qeth" && haskey (InstallInf, "hwaddr") && contains (known_hwaddr, InstallInf["hwaddr"]:"")) + // set HW address only for qeth set to Layer 2 (bnc #479481) + if (InstallInf["type"]:"" == "qeth" && InstallInf["QETH_LAYER2_SUPPORT"]:"0" != "1") InstallInf = remove (InstallInf, "hwaddr"); } -- 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] r55783 - /trunk/autoinstallation/doc/RulesAndClasses.xml
by ug＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: ug Date: Thu Feb 26 12:02:53 2009 New Revision: 55783 URL: http://svn.opensuse.org/viewcvs/yast?rev=55783&view=rev Log: little docu fix Modified: trunk/autoinstallation/doc/RulesAndClasses.xml Modified: trunk/autoinstallation/doc/RulesAndClasses.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/RulesAndCla… ============================================================================== --- trunk/autoinstallation/doc/RulesAndClasses.xml (original) +++ trunk/autoinstallation/doc/RulesAndClasses.xml Thu Feb 26 12:02:53 2009 @@ -395,7 +395,7 @@ <entry>mac</entry> <entry>MAC address of host</entry> <entry>This attribute must always match exactly. (MAC addresses - to be matched should be in the form <emphasis>0080C8F6484C</emphasis></entry> + to be matched should be in the form <emphasis>0080c8f6484c</emphasis></entry> </row> <row> <entry>linux</entry> -- 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] r55782 - /trunk/storage/storage/src/modules/StorageProposal.ycp
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 11:39:45 2009 New Revision: 55782 URL: http://svn.opensuse.org/viewcvs/yast?rev=55782&view=rev Log: - also restrict dasds used for proposal (although we don't make a proposal on s390) Modified: trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Thu Feb 26 11:39:45 2009 @@ -498,6 +498,7 @@ helper("/dev/sd"); helper("/dev/hd"); helper("/dev/cciss/"); + helper("/dev/dasd"); y2milestone("restrict_disk_names: ret %1", disks); return disks; -- 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] r55781 - in /trunk/sudo/src: complex.ycp dialog-cmnd.ycp dialog-host.ycp
by kmachalkova＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: kmachalkova Date: Thu Feb 26 10:44:14 2009 New Revision: 55781 URL: http://svn.opensuse.org/viewcvs/yast?rev=55781&view=rev Log: use InputFields, use ButtonBoxes Modified: trunk/sudo/src/complex.ycp trunk/sudo/src/dialog-cmnd.ycp trunk/sudo/src/dialog-host.ycp Modified: trunk/sudo/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/complex.ycp?rev=55781&r… ============================================================================== --- trunk/sudo/src/complex.ycp (original) +++ trunk/sudo/src/complex.ycp Thu Feb 26 10:44:14 2009 @@ -87,10 +87,9 @@ `InputField(`id("host_name"),_("Hostname or Network"), new_host) ) ), - `HBox( - `PushButton(`id(`ok), Label::OKButton()), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `ButtonBox( + `PushButton(`id(`ok), `opt(`default, `okButton), Label::OKButton()), + `PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()) ) )); @@ -123,10 +122,9 @@ `ComboBox(`id("user_name"),_("Local and System Users (Groups)"), users) ) ), - `HBox( - `PushButton(`id(`ok), Label::OKButton()), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `ButtonBox( + `PushButton(`id(`ok), `opt(`default, `okButton), Label::OKButton()), + `PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()) ) )); @@ -179,10 +177,9 @@ ) ), `VSpacing(0.5), - `HBox( - `PushButton(`id(`ok), Label::OKButton()), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `ButtonBox( + `PushButton(`id(`ok), `opt(`default, `okButton), Label::OKButton()), + `PushButton(`id(`cancel), `opt(`cancelButton), Label::CancelButton()) ) )); Modified: trunk/sudo/src/dialog-cmnd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-cmnd.ycp?rev=557… ============================================================================== --- trunk/sudo/src/dialog-cmnd.ycp (original) +++ trunk/sudo/src/dialog-cmnd.ycp Thu Feb 26 10:44:14 2009 @@ -39,7 +39,7 @@ } term contents = `VBox ( - `TextEntry(`id("cmnd_alias_name"),_("Alias Name (in CAPITALS)")), + `Left(`InputField(`id("cmnd_alias_name"),_("Alias Name (in CAPITALS)"))), `Left(`Label(_("Command Names or Directories in the Alias"))), `Table(`id("cmnd_alias_members"),`header( _("Command"), Modified: trunk/sudo/src/dialog-host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-host.ycp?rev=557… ============================================================================== --- trunk/sudo/src/dialog-host.ycp (original) +++ trunk/sudo/src/dialog-host.ycp Thu Feb 26 10:44:14 2009 @@ -43,7 +43,7 @@ } term contents = `VBox ( - `TextEntry(`id("host_alias_name"),_("Alias Name (in CAPITALS)")), + `Left( `InputField(`id("host_alias_name"),_("Alias Name (in CAPITALS)"))), `Left(`Label(_("Hostnames or Networks in the Alias"))), `Table(`id("host_alias_members"),`header(_("Host Names/Networks")),[]), `Left(`HBox( -- 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] r55780 - /tags/branch-Code-11-2_17_0/pos-installation/
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 10:27:43 2009 New Revision: 55780 URL: http://svn.opensuse.org/viewcvs/yast?rev=55780&view=rev Log: Created tag branch-Code-11-2_17_0 for pos-installation Added: tags/branch-Code-11-2_17_0/pos-installation/ - copied from r55779, branches/SuSE-Code-11-Branch/pos-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] r55779 - in /branches/SuSE-Code-11-Branch/pos-installation: VERSION package/yast2-pos-installation.changes src/clients/inst_slepos_data_migration.ycp
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 10:27:18 2009 New Revision: 55779 URL: http://svn.opensuse.org/viewcvs/yast?rev=55779&view=rev Log: - Adapted to SLE 11 Codebase. - 2.17.0 Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_data_migration.ycp Modified: branches/SuSE-Code-11-Branch/pos-installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/pos-installation/VERSION Thu Feb 26 10:27:18 2009 @@ -1 +1 @@ -2.13.6 +2.17.0 Modified: branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes (original) +++ branches/SuSE-Code-11-Branch/pos-installation/package/yast2-pos-installation.changes Thu Feb 26 10:27:18 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 26 10:21:23 CET 2009 - locilka(a)suse.cz + +- Adapted to SLE 11 Codebase. +- 2.17.0 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain(a)suse.cz - added categories Settings and System into desktop file Modified: branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_data_migration.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/pos-insta… ============================================================================== --- branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_data_migration.ycp (original) +++ branches/SuSE-Code-11-Branch/pos-installation/src/clients/inst_slepos_data_migration.ycp Thu Feb 26 10:27:18 2009 @@ -359,7 +359,7 @@ `Left (`CheckBox (`id (`do_backup), `opt (`notify), _("Create a Backup &Archive"))), `HBox ( // TRANSLATORS: Text entry - `MinWidth (50, `TextEntry (`id (`backup_archive), _("Archive &Location"), backup_archive)), + `MinWidth (50, `InputField (`id (`backup_archive), _("Archive &Location"), backup_archive)), `HSpacing (1), `VBox ( `VSpacing (1), @@ -414,7 +414,8 @@ // TRANSLATORS: File-browse dialog caption _("Backup Archive File Location") ); - UI::ChangeWidget (`id (`backup_archive), `Value, existdir); + if (existdir != nil) + UI::ChangeWidget (`id (`backup_archive), `Value, existdir); // checkbox "do backup" selected } else if (ret == `do_backup) { -- 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] r55778 - in /trunk/sudo/src: dialog-runas.ycp dialog-user.ycp
by kmachalkova＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: kmachalkova Date: Thu Feb 26 10:27:11 2009 New Revision: 55778 URL: http://svn.opensuse.org/viewcvs/yast?rev=55778&view=rev Log: The same thing for RunAs aliases (#421053) Modified: trunk/sudo/src/dialog-runas.ycp trunk/sudo/src/dialog-user.ycp Modified: trunk/sudo/src/dialog-runas.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-runas.ycp?rev=55… ============================================================================== --- trunk/sudo/src/dialog-runas.ycp (original) +++ trunk/sudo/src/dialog-runas.ycp Thu Feb 26 10:27:11 2009 @@ -9,13 +9,9 @@ include "sudo/complex.ycp"; include "sudo/helps.ycp"; -any RedrawRunAsAlias(string name, list <string> members, list <string> users) { +void RedrawRunAsAlias( list <string> members ) { list <term> items = []; - if (name != "") { - UI::ChangeWidget(`id("runas_alias_name"), `Value, name); - } - foreach(string it, members, { items = add(items, `item(`id(it),it)); }); @@ -23,9 +19,6 @@ UI::ChangeWidget(`id("runas_alias_members"),`Items, items); UI::ChangeWidget(`id("remove_member"), `Enabled, (items != [])); - UI::ReplaceWidget(`id("all_run_as_replace"), - `ComboBox(`id("all_run_as"),_("Local and System Users"),sort(string s, string t, users, ``( s < t)))); - } any AddEditRunAsAliasDialog (string what) { @@ -50,33 +43,25 @@ } term contents = `VBox ( - `TextEntry(`id("runas_alias_name"),_("Alias Name (in CAPITALS)")), + `Left(`InputField(`id("runas_alias_name"),_("Alias Name (in CAPITALS)"))), `VSpacing(1), - `HBox( - `VBox( - `opt(`hstretch), - `Left(`ReplacePoint(`id("all_run_as_replace"), - `ComboBox(`id("all_run_as"),_("Local and System Users"), []) - )), - `Table(`id("runas_alias_members"), `opt(`hstretch,`vstretch), `header(_("Alias Members")),[]) - ), - `HSquash( - `VBox ( - `VSpacing(1.1), - `PushButton ( `id ( "add_member" ), `opt ( `hstretch, `key_F3), " " + Label::AddButton() + " "), - `PushButton ( `id ( "remove_member" ), `opt ( `hstretch , `key_F5), " " + Label::DeleteButton() + " "), - `Empty(`opt(`vstretch)) + `VBox( + `Table(`id("runas_alias_members"), `opt(`hstretch,`vstretch), `header(_("Alias Members")),[]), + `HBox( + `PushButton ( `id ( "add_member" ), `opt ( `key_F3), " " + Label::AddButton() + " "), + `PushButton ( `id ( "remove_member" ), `opt ( `key_F5), " " + Label::DeleteButton() + " "), + `HStretch() ) - ) + ) - ) - ); + ); Wizard::SetContentsButtons(caption, contents,HELPS["runas_alias"]:"",Label::CancelButton(), Label::OKButton()); Wizard::HideAbortButton(); UI::ChangeWidget (`id("runas_alias_name"), `ValidChars, "_0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + UI::ChangeWidget (`id("runas_alias_name"), `Value, name); - RedrawRunAsAlias(name, alias_members,users); + RedrawRunAsAlias(alias_members); any ret = nil; while(true) { @@ -109,23 +94,24 @@ Sudo::SetModified(); break; /* back */ - }else if(ret == `back) { + }else if(ret == `back) { break; /* add users*/ - }else if(ret == "add_member"){ - string new_member = (string) UI::QueryWidget(`id("all_run_as"),`Value); + } else if(ret == "add_member"){ + string new_member = AddUserDialog( users ); - alias_members = add(alias_members, new_member); - users = filter(string s, users, ``(s != new_member)); - RedrawRunAsAlias("",alias_members, users); + if (new_member != "") + { + alias_members = add(alias_members, new_member); + users = filter(string s, users, ``(s != new_member)); + RedrawRunAsAlias(alias_members); + } /* delete users */ - }else if (ret == "remove_member"){ - string current_item = (string) UI::QueryWidget(`id("runas_alias_members"), `CurrentItem); - alias_members = filter(string s, alias_members, ``(s != current_item)); - users = add(users, current_item); - UI::ReplaceWidget(`id("all_run_as_replace"), - `ComboBox(`id("all_run_as"),_("Local and System Users"),users)); - RedrawRunAsAlias("",alias_members, users); + } else if (ret == "remove_member"){ + string current_item = (string) UI::QueryWidget(`id("runas_alias_members"), `CurrentItem); + alias_members = filter(string s, alias_members, ``(s != current_item)); + users = add(users, current_item); + RedrawRunAsAlias(alias_members); /* unknown */ } else { y2error("unexpected retcode: %1", ret); Modified: trunk/sudo/src/dialog-user.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sudo/src/dialog-user.ycp?rev=557… ============================================================================== --- trunk/sudo/src/dialog-user.ycp (original) +++ trunk/sudo/src/dialog-user.ycp Thu Feb 26 10:27:11 2009 @@ -101,8 +101,8 @@ { alias_members = add(alias_members, new_member); users = filter(string s, users, ``(s != new_member)); + RedrawUserAlias( alias_members ); } - RedrawUserAlias( alias_members ); /* delete users */ }else if (ret == "remove_member"){ string current_item = (string) UI::QueryWidget(`id("user_alias_members"), `CurrentItem); -- 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] r55777 - /tags/stable-2_18_0/firewall/
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 10:16:19 2009 New Revision: 55777 URL: http://svn.opensuse.org/viewcvs/yast?rev=55777&view=rev Log: Created tag stable-2_18_0 for firewall Added: tags/stable-2_18_0/firewall/ - copied from r55776, trunk/firewall/ -- 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] r55776 - /tags/stable-2_18_0/firewall/
by locilka＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: locilka Date: Thu Feb 26 10:16:00 2009 New Revision: 55776 URL: http://svn.opensuse.org/viewcvs/yast?rev=55776&view=rev Log: One more change Removed: tags/stable-2_18_0/firewall/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0