December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60012 - in /trunk/printer/src: basicmodify.ycp connectionwizard.ycp
by jsmeix＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: jsmeix Date: Wed Dec 9 12:48:14 2009 New Revision: 60012 URL: http://svn.opensuse.org/viewcvs/yast?rev=60012&view=rev Log: An existing connection can be modified by the "Connection Wizard" (see bnc #553871) which launches with the values of the existing connection preset in the "Connection Wizard" or uses "Specify Arbitrary Device URI" as fallback if the existing URI scheme does not match to a specific sub-dialog in the "Connection Wizard". Modified: trunk/printer/src/basicmodify.ycp trunk/printer/src/connectionwizard.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 Wed Dec 9 12:48:14 2009 @@ -93,6 +93,8 @@ // Only local queues can be selected in the overview dialog to be modified. // For a local raw queue ppd is the empty string. // For a local queue with a System V style interface script ppd is "/etc/cups/interfaces/<name-of-the-script>". + // For a local queue with URI "ipp://server/printers/queue" ppd is "ipp://server/printers/queue.ppd". + // For a normal local queue with URI "ipp://server/resource" ppd is "/etc/cups/ppd/<queue-name>.ppd". // For a normal local queue ppd is "/etc/cups/ppd/<queue-name>.ppd". // The leading part "/etc/" may vary depending on how the local cupsd // is installed or configured, see "/usr/bin/cups-config --serverroot". @@ -110,7 +112,7 @@ { ppd = ""; } } - if( issubstring( ppd, "/ppd/" ) ) + if( issubstring( ppd, "/cups/ppd/" ) ) { // A "(recommended)" is removed because there is a special patch in CUPS // which suppresses it in certain "lpinfo -m" output. // Note the YCP quoting: \" becomes " and \\n becomes \n in the commandline. Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Wed Dec 9 12:48:14 2009 @@ -154,17 +154,44 @@ if( "" == current_model_info || "unknown" == tolower( current_model_info ) ) - { current_model_info = Printer::queues[Printer::selected_queues_index,"description"]:""; - if( "" != current_model_info - && "unknown" != tolower( current_model_info ) - ) - { current_model_info = Printer::DeriveModelName( current_model_info ); + { if( Printer::selected_queues_index >= 0 ) + { if( "local" == Printer::queues[Printer::selected_queues_index,"config"]:"" ) + { string ppd = Printer::queues[Printer::selected_queues_index,"ppd"]:""; + // For a local raw queue ppd is the empty string. + // For a local queue with a System V style interface script ppd is "/etc/cups/interfaces/<name-of-the-script>". + // For a local queue with URI "ipp://server/printers/queue" ppd is "ipp://server/printers/queue.ppd". + // For a normal local queue with URI "ipp://server/resource" ppd is "/etc/cups/ppd/<queue-name>.ppd". + // For a normal local queue ppd is "/etc/cups/ppd/<queue-name>.ppd". + // The leading part "/etc/" may vary depending on how the local cupsd + // is installed or configured, see "/usr/bin/cups-config --serverroot". + if( "" == ppd ) + { no_default_raw_queue = false; + } + else + { no_default_raw_queue = true; + } + if( issubstring( ppd, "/cups/ppd/" ) ) + { // A "(recommended)" is removed because there is a special patch in CUPS + // which suppresses it in certain "lpinfo -m" output. + // Note the YCP quoting: \" becomes " and \\n becomes \n in the commandline. + string commandline = "grep '^\*NickName' " + ppd + " | cut -s -d '\"' -f2 | sed -e 's/(recommended)//' -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | tr -s ' ' | tr -d '\\n'"; + if( Printerlib::ExecuteBashCommand( commandline ) ) + { current_model_info = Printerlib::result["stdout"]:""; + } + } + } + if( "" == current_model_info + || "unknown" == tolower( current_model_info ) + ) + { current_model_info = Printer::queues[Printer::selected_queues_index,"description"]:""; + } } } if( "" != current_model_info && "unknown" != tolower( current_model_info ) ) - { if( no_default_raw_queue ) + { current_model_info = Printer::DeriveModelName( current_model_info ); + if( no_default_raw_queue ) { content = `Left ( `ComboBox ( `id("manufacturers_combo_box"), @@ -221,7 +248,7 @@ term getContentFromBackend( string backend ) { list items = []; - backend = sformat( "%1:/", backend ); + backend = backend + ":/"; foreach( term row, (list<term>)Printer::ConnectionItems( "" ), { if( backend == substring( row[2]:"", 0, size(backend) ) ) @@ -348,6 +375,285 @@ content = getContentFromBackend("hp"); break; case(`serial): + current_device_uri = getCurrentDeviceURI(); + string current_serial_device_node = ""; + list <term> serial_device_node_items = []; + if( "serial:/" == substring( current_device_uri, 0, size( "serial:/" ) ) ) + { // The Device URI has the form like: + // serial:/dev/ttyS6?baud=115200+bits=7+parity=space+flow=hard+stop=1 + // remove the scheme 'serial:' so that only '/dev/ttyS6' is left: + current_serial_device_node = mergestring( sublist( splitstring( current_device_uri, ":?" ), 1, 1 ), "" ); + + } + boolean current_serial_device_node_found = false; + foreach( string device_node, + [ "/dev/ttyS0", + "/dev/ttyS1", + "/dev/ttyS2", + "/dev/ttyS3", + "/dev/ttyS4", + "/dev/ttyS5", + "/dev/ttyS6", + "/dev/ttyS7" + ], + { if( current_serial_device_node == device_node ) + { current_serial_device_node_found = true; + // Have the current serial device node preselected: + serial_device_node_items = add( serial_device_node_items, + `item( `id( device_node ), device_node, true ) + ); + } + else + { serial_device_node_items = add( serial_device_node_items, + `item( `id( device_node ), device_node ) + ); + } + } + ); + if( ! current_serial_device_node_found ) + { if( "" == current_serial_device_node ) + { // Have an empty entry topmost and preselected to be on the safe side because + // the CUPS serial backend may blindly write to any device: + serial_device_node_items = prepend( serial_device_node_items, `item( `id(""), "", true ) ); + } + else + { // Have the current_serial_device_node topmost and preselected: + serial_device_node_items = prepend( serial_device_node_items, + `item( `id( current_serial_device_node ), + current_serial_device_node, + true + ) + ); + } + } + list <term> serial_baud_rate_items = []; + list <term> serial_data_bits_items = []; + list <term> serial_parity_items = []; + list <term> serial_flow_control_items = []; + list <term> serial_stop_bits_items = []; + if( "serial:/" == substring( current_device_uri, 0, size( "serial:/" ) ) ) + { foreach( string parameter, + // The Device URI has the form like: + // serial:/dev/ttyS6?baud=115200+bits=7+parity=space+flow=hard+stop=1 + // remove all before the '?' so that only the parameters 'baud=115200+bits=7...' are left + // as strings in a list like ["baud=115200","bits=7","parity=space","flow=hard","stop=1"]: + sublist( splitstring( current_device_uri, "?+" ), 1 ), + { list <string> keyword_value = splitstring( parameter, "=" ); + string keyword = keyword_value[0]:""; + string value = keyword_value[1]:""; + boolean value_found = false; + if( "baud" == keyword ) + { foreach( string item_value, + // The preset values are from backend/serial.c in the CUPS 1.3.9 sources: + [ "1200", "2400", "4800", "9600", "19200", "38400", "57600", "115200", "230400" ], + { if( value == item_value ) + { value_found = true; + // Have the current value preselected: + serial_baud_rate_items = add( serial_baud_rate_items, + `item( `id( item_value ), item_value, true ) + ); + } + else + { serial_baud_rate_items = add( serial_baud_rate_items, + `item( `id( item_value ), item_value ) + ); + } + } + ); + if( ! value_found ) + { if( "" == value ) + { // Have an empty entry topmost and preselected to be on the safe side because + // the baud rate may have to be exactly what is set in the printer (e.g. via DIP switches): + serial_baud_rate_items = prepend( serial_baud_rate_items, `item( `id(""), "", true ) ); + } + else + { // Only the above preset values are known to be supported by CUPS. + // If the current value is none of them, it might be invalid or a typo. + // Therefore the current value is added with an appropriate hint. + // Nevertheless the current value must be topmost and preselected because + // anything else which might be preselected (even an empty value) + // would silently change the current value to the preselected one + // when the user clicks [OK]: + serial_baud_rate_items = prepend( serial_baud_rate_items, + `item( `id( value ), + value + " (might be invalid or a typo)", + true + ) + ); + } + } + } + if( "bits" == keyword ) + { foreach( string item_value, + // The preset values are from backend/serial.c in the CUPS 1.3.9 sources: + [ "7", "8" ], + { if( value == item_value ) + { value_found = true; + // Have the current value preselected: + serial_data_bits_items = add( serial_data_bits_items, + `item( `id( item_value ), item_value, true ) + ); + } + else + { serial_data_bits_items = add( serial_data_bits_items, + `item( `id( item_value ), item_value ) + ); + } + } + ); + if( ! value_found ) + { if( "" == value ) + { // Have an empty entry topmost and preselected to be on the safe side because + // the data bits may have to be exactly what is set in the printer (e.g. via DIP switches): + serial_data_bits_items = prepend( serial_data_bits_items, `item( `id(""), "", true ) ); + } + else + { // Only the above preset values are known to be supported by CUPS. + // If the current value is none of them, it might be invalid or a typo. + // Therefore the current value is added with an appropriate hint. + // Nevertheless the current value must be topmost and preselected because + // anything else which might be preselected (even an empty value) + // would silently change the current value to the preselected one + // when the user clicks [OK]: + serial_data_bits_items = prepend( serial_data_bits_items, + `item( `id( value ), + value + " (might be invalid or a typo)", + true + ) + ); + } + } + } + if( "parity" == keyword ) + { foreach( string item_value, + // The preset values are from backend/serial.c in the CUPS 1.3.9 sources: + [ "even", "odd", "none", "space", "mark" ], + { if( value == item_value ) + { value_found = true; + // Have the current value preselected: + serial_parity_items = add( serial_parity_items, + `item( `id( item_value ), item_value, true ) + ); + } + else + { serial_parity_items = add( serial_parity_items, + `item( `id( item_value ), item_value ) + ); + } + } + ); + if( ! value_found ) + { if( "" == value ) + { // Have an empty entry topmost and preselected to be on the safe side because + // the parity may have to be exactly what is set in the printer (e.g. via DIP switches): + serial_parity_items = prepend( serial_parity_items, `item( `id(""), "", true ) ); + } + else + { // Only the above preset values are known to be supported by CUPS. + // If the current value is none of them, it might be invalid or a typo. + // Therefore the current value is added with an appropriate hint. + // Nevertheless the current value must be topmost and preselected because + // anything else which might be preselected (even an empty value) + // would silently change the current value to the preselected one + // when the user clicks [OK]: + serial_parity_items = prepend( serial_parity_items, + `item( `id( value ), + value + " (might be invalid or a typo)", + true + ) + ); + } + } + } + if( "flow" == keyword ) + { foreach( string item_value, + // The preset values are from backend/serial.c in the CUPS 1.3.9 sources: + [ "none", "soft", "hard", "dtrdsr" ], + { string item_text = item_value; + if( "soft" == item_value ) item_text = "XON/XOFF (software)"; + if( "hard" == item_value ) item_text = "RTS/CTS (hardware)"; + if( "dtrdsr" == item_value ) item_text = "DTR/DSR (hardware)"; + if( value == item_value ) + { value_found = true; + // Have the current value preselected: + serial_flow_control_items = add( serial_flow_control_items, + `item( `id( item_value ), item_text, true ) + ); + } + else + { serial_flow_control_items = add( serial_flow_control_items, + `item( `id( item_value ), item_text ) + ); + } + } + ); + if( ! value_found ) + { if( "" == value ) + { // Have an empty entry topmost and preselected to be on the safe side because the + // flow control may have to be exactly what is set in the printer (e.g. via DIP switches): + serial_flow_control_items = prepend( serial_flow_control_items, `item( `id(""), "", true ) ); + } + else + { // Only the above preset values are known to be supported by CUPS. + // If the current value is none of them, it might be invalid or a typo. + // Therefore the current value is added with an appropriate hint. + // Nevertheless the current value must be topmost and preselected because + // anything else which might be preselected (even an empty value) + // would silently change the current value to the preselected one + // when the user clicks [OK]: + serial_flow_control_items = prepend( serial_flow_control_items, + `item( `id( value ), + value + " (might be invalid or a typo)", + true + ) + ); + } + } + } + if( "stop" == keyword ) + { foreach( string item_value, + // The preset values are from backend/serial.c in the CUPS 1.3.9 sources: + [ "1", "2" ], + { if( value == item_value ) + { value_found = true; + // Have the current value preselected: + serial_stop_bits_items = add( serial_stop_bits_items, + `item( `id( item_value ), item_value, true ) + ); + } + else + { serial_stop_bits_items = add( serial_stop_bits_items, + `item( `id( item_value ), item_value ) + ); + } + } + ); + if( ! value_found ) + { if( "" == value ) + { // Have an empty entry topmost and preselected to be on the safe side because the + // stop bits may have to be exactly what is set in the printer (e.g. via DIP switches): + serial_stop_bits_items = prepend( serial_stop_bits_items, `item( `id(""), "", true ) ); + } + else + { // Only the above preset values are known to be supported by CUPS. + // If the current value is none of them, it might be invalid or a typo. + // Therefore the current value is added with an appropriate hint. + // Nevertheless the current value must be topmost and preselected because + // anything else which might be preselected (even an empty value) + // would silently change the current value to the preselected one + // when the user clicks [OK]: + serial_stop_bits_items = prepend( serial_stop_bits_items, + `item( `id( value ), + value + " (might be invalid or a typo)", + true + ) + ); + } + } + } + } + ); + } model_content = getContentFromCurrentModel( true ); content = `VBox ( `Left @@ -360,19 +666,7 @@ // a serial device node (e.g. /dev/ttyS0 or /dev/ttyS1) // can be selected or entered: _("&Serial device"), - [ // Have nothing preselected to be on the safe side because - // the CUPS serial backend may blindly write to the device, - // (see backend/serial.c in the CUPS 1.3.9 sources): - `item( `id(""), "", true ), - `item( `id("/dev/ttyS0"), "/dev/ttyS0" ), - `item( `id("/dev/ttyS1"), "/dev/ttyS1" ), - `item( `id("/dev/ttyS2"), "/dev/ttyS2" ), - `item( `id("/dev/ttyS3"), "/dev/ttyS3" ), - `item( `id("/dev/ttyS4"), "/dev/ttyS4" ), - `item( `id("/dev/ttyS5"), "/dev/ttyS5" ), - `item( `id("/dev/ttyS6"), "/dev/ttyS6" ), - `item( `id("/dev/ttyS7"), "/dev/ttyS7" ) - ] + serial_device_node_items ) ), `Left @@ -386,21 +680,7 @@ // the baud rate for a serial device // can be selected or entered: _("&Baud rate"), - // The preset values are from backend/serial.c - // in the CUPS 1.3.9 sources: - [ // Have nothing preselected to be on the safe side because the baud rate - // may have to be exactly what is set in the printer (e.g. via DIP switches): - `item( `id(""), "", true ), - `item( `id("1200"), "1200" ), - `item( `id("2400"), "2400" ), - `item( `id("4800"), "4800" ), - `item( `id("9600"), "9600" ), - `item( `id("19200"), "19200" ), - `item( `id("38400"), "38400" ), - `item( `id("57600"), "57600" ), - `item( `id("115200"), "115200" ), - `item( `id("230400"), "230400" ) - ] + serial_baud_rate_items ) ), `Left @@ -416,12 +696,7 @@ // the number of data bits for a serial device // can be selected or entered: _("&Data bits"), - // The preset values are from backend/serial.c - // in the CUPS 1.3.9 sources: - [ `item( `id(""), "", true ), - `item( `id("7"), "7" ), - `item( `id("8"), "8" ) - ] + serial_data_bits_items ) ), `Left @@ -435,15 +710,7 @@ // the parity checking for a serial device // can be selected or entered: _("&Parity checking"), - // The preset values are from backend/serial.c - // in the CUPS 1.3.9 sources: - [ `item( `id(""), "", true ), - `item( `id("even"), "even" ), - `item( `id("odd"), "odd" ), - `item( `id("none"), "none" ), - `item( `id("space"), "space" ), - `item( `id("mark"), "mark" ) - ] + serial_parity_items ) ), `Left @@ -459,14 +726,7 @@ // the flow control for a serial device // can be selected or entered: _("&Flow control"), - // The preset values are from backend/serial.c - // in the CUPS 1.3.9 sources: - [ `item( `id(""), "", true ), - `item( `id("none"), "none" ), - `item( `id("soft"), "XON/XOFF (software)" ), - `item( `id("hard"), "RTS/CTS (hardware)" ), - `item( `id("dtrdsr"), "DTR/DSR (hardware)" ) - ] + serial_flow_control_items ) ), `Left @@ -480,12 +740,7 @@ // the number of stop bits for a serial device // can be selected or entered: _("S&top bits"), - // The preset values are from backend/serial.c - // in the CUPS 1.3.9 sources: - [ `item( `id(""), "", true ), - `item( `id("1"), "1" ), - `item( `id("2"), "2" ) - ] + serial_stop_bits_items ) ), model_content @@ -553,11 +808,7 @@ { current_bluetooth_device_id = uri_parts[1]:""; } } - if( "" == current_bluetooth_device_id ) - { // Have an empty string preselected to be on the safe side because - // the bluetooth backend may blindly write to the bluetooth device: - bluetooth_device_id_items = [ `item( `id(""), "", true ) ]; - } + boolean current_bluetooth_device_id_found = false; foreach( string word, splitstring( bluetooth_device_list, " " ), { if( regexpmatch( word, "..:..:..:..:..:..") ) @@ -567,7 +818,8 @@ string hexnumber = filterchars( word, "0123456789ABCDEFabcdef" ); if( "" != hexnumber ) { if( current_bluetooth_device_id == hexnumber ) - { // Have the current bluetooth device id preselected: + { current_bluetooth_device_id_found = true; + // Have the current bluetooth device id preselected: bluetooth_device_id_items = add( bluetooth_device_id_items, `item( `id( hexnumber ), hexnumber, true ) ); @@ -581,6 +833,22 @@ } } ); + if( ! current_bluetooth_device_id_found ) + { if( "" == current_bluetooth_device_id ) + { // Have an empty entry topmost and preselected to be on the safe side because + // the bluetooth backend may blindly write to any bluetooth device: + bluetooth_device_id_items = prepend( bluetooth_device_id_items, `item( `id(""), "", true ) ); + } + else + { // Have the current_bluetooth_device_id topmost and preselected: + bluetooth_device_id_items = prepend( bluetooth_device_id_items, + `item( `id( current_bluetooth_device_id ), + current_bluetooth_device_id, + true + ) + ); + } + } model_content = getContentFromCurrentModel( true ); content = `VBox ( `Left @@ -633,16 +901,12 @@ current_scsi_device_node = mergestring( sublist( splitstring( current_device_uri, ":" ), 1 ), "" ); } - if( "" == current_scsi_device_node ) - { // Have an empty string preselected to be on the safe side because - // the CUPS scsi backend may blindly write to the device, - // (see backend/scsi-linux.c in the CUPS 1.3.9 sources): - scsi_device_node_items = [ `item( `id(""), "", true ) ]; - } + boolean current_scsi_device_node_found = false; foreach( string device_node, [ "/dev/sg0", "/dev/sg1", "/dev/sg2", "/dev/sg3", "/dev/sg4", "/dev/sg5", "/dev/sg6", "/dev/sg7" ], { if( current_scsi_device_node == device_node ) - { // Have the current scsi device node preselected: + { current_scsi_device_node_found = true; + // Have the current scsi device node preselected: scsi_device_node_items = add( scsi_device_node_items, `item( `id( device_node ), device_node, true ) ); @@ -654,6 +918,21 @@ } } ); + + if( ! current_scsi_device_node_found ) + { if( "" == current_scsi_device_node ) + { // Have an empty entry topmost and preselected to be on the safe side because + // the CUPS scsi backend may blindly write to any device, + // (see backend/scsi-linux.c in the CUPS 1.3.9 sources): + scsi_device_node_items = prepend( scsi_device_node_items, `item( `id(""), "", true ) ); + } + else + { // Have the current_scsi_device_node topmost and preselected: + scsi_device_node_items = prepend( scsi_device_node_items, + `item( `id( current_scsi_device_node ), current_scsi_device_node, true ) + ); + } + } model_content = getContentFromCurrentModel( true ); content = `VBox ( `Left @@ -1312,8 +1591,8 @@ // Show it as wide as possible because it may have to contain // longer stuff like 'path/to/command?option1=value1&option2=value2': `opt(`hstretch), - // TRANSLATORS: Text entry for program name that will be called via pipe - _("Program (/path/to/command?option1=value1&option2=value2)"), + // TRANSLATORS: Text entry for program name that will be called via pipe: + _("Program (/path/to/command?option=value)"), uri ) ), @@ -1689,7 +1968,7 @@ { Popup::Error( _("The 'space' parity checking is only supported with 7 data bits.") ); } else - { if( "mark" == serial_parity && "7" != serial_data_bits && "1" != serial_stop_bits ) + { if( "mark" == serial_parity && ( "7" != serial_data_bits || "1" != serial_stop_bits ) ) { Popup::Error( _("The 'mark' parity checking is only supported with 7 data bits and 1 stop bit.") ); } 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] r60011 - in /trunk/bootloader: package/yast2-bootloader.changes src/modules/BootArch.ycp
by juhliarik＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: juhliarik Date: Wed Dec 9 11:40:19 2009 New Revision: 60011 URL: http://svn.opensuse.org/viewcvs/yast?rev=60011&view=rev Log: added patch for KMS bnc#561566 Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootArch.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Wed Dec 9 11:40:19 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Dec 9 11:39:18 CET 2009 - juhliarik(a)suse.cz + +- added patch for KMS (bnc#561566) + +------------------------------------------------------------------- Mon Dec 7 14:26:19 CET 2009 - juhliarik(a)suse.cz - added fix for problem with characters in name (bnc#558542) Modified: trunk/bootloader/src/modules/BootArch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootArch.… ============================================================================== --- trunk/bootloader/src/modules/BootArch.ycp (original) +++ trunk/bootloader/src/modules/BootArch.ycp Wed Dec 9 11:40:19 2009 @@ -98,11 +98,11 @@ string ret = ""; if (Arch::i386 ()) { - ret = "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1"; + ret = "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset"; } else if (Arch::x86_64 ()) { - ret = "showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1"; + ret = "showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset"; } else if (Arch::ia64 ()) { -- 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] r60010 - /tags/branch-Code-11-2_17_78_2/network/
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 10:55:14 2009 New Revision: 60010 URL: http://svn.opensuse.org/viewcvs/yast?rev=60010&view=rev Log: Created tag branch-Code-11-2_17_78_2 for network Added: tags/branch-Code-11-2_17_78_2/network/ - copied from r60009, 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] r60009 - /tags/branch-Code-11-2_17_78_2/
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 10:55:09 2009 New Revision: 60009 URL: http://svn.opensuse.org/viewcvs/yast?rev=60009&view=rev Log: Created tag branch-Code-11-2_17_78_2 Added: tags/branch-Code-11-2_17_78_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] r60008 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/modules/DSL.ycp src/modules/ISDN.ycp
by mzugec＠svn.opensuse.org 09 Dec '09

09 Dec '09

Author: mzugec Date: Wed Dec 9 10:55:00 2009 New Revision: 60008 URL: http://svn.opensuse.org/viewcvs/yast?rev=60008&view=rev Log: ISDN: fixed creating configuration with incorrect name (bnc#534504) 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/modules/DSL.ycp branches/SuSE-Code-11-Branch/network/src/modules/ISDN.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 Wed Dec 9 10:55:00 2009 @@ -1 +1 @@ -2.17.78.1 +2.17.78.2 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 Wed Dec 9 10:55:00 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Dec 9 10:48:36 CET 2009 - mzugec(a)suse.de + +- ISDN: fixed creating configuration with incorrect name (bnc#534504) +- 2.17.78.2 + +------------------------------------------------------------------- Mon Nov 9 16:36:18 CET 2009 - mzugec(a)suse.cz - YaPI: backported NETWORK.pm file Modified: branches/SuSE-Code-11-Branch/network/src/modules/DSL.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/DSL.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/DSL.ycp Wed Dec 9 10:55:00 2009 @@ -341,7 +341,7 @@ NetworkInterfaces::Edit(dev); devmap = NetworkInterfaces::Current; type = typ; -// device = num; + device = sformat("%1%2", type,num); operation = `edit; } Modified: branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/ISDN.ycp Wed Dec 9 10:55:00 2009 @@ -795,13 +795,14 @@ */ global define boolean AddIf(string proto) ``{ type = "net"; - device = GetFreeDevice(type); + device = sformat("%1%2", type, GetFreeDevice(type)); interface = $[ "PROTOCOL": proto, "USERCONTROL": "yes", ]; interface = set_ifparameters (interface); operation = `addif; + y2milestone("Adding network configuration %1", device); return true; } -- 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] <rest-service> jr-basemodel : add mass assignments whitelisting and blacklisting
by Josef Reidinger 09 Dec '09

09 Dec '09

ref: refs/heads/jr-basemodel commit 1ece5a70882938519f0748636e3de70ca7323eda Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Dec 9 10:51:51 2009 +0100 add mass assignments whitelisting and blacklisting --- webservice/lib/base_model/base.rb | 14 +++++++++++- webservice/lib/base_model/mass_assignment.rb | 30 +++++++++++++++++++++++++- webservice/test/unit/base_model_test.rb | 20 ++++++++++++++++- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index e1387e1..f9ed7f3 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -1,5 +1,8 @@ module BaseModel class Base + def initialize(attr={}) + load(attr) + end def save create_or_update @@ -29,9 +32,18 @@ module BaseModel def destroy end - include BaseModel::MassAssignment +#remove overwritten method_missing from activeRecord + alias :method_missing_orig :method_missing include ActiveRecord::AttributeMethods + alias :method_missing :method_missing_orig +#remove overwritten respond_to + alias :respond_to? :respond_to_without_attributes? + include ActiveRecord::Validations include ActiveRecord::Callbacks + + + include BaseModel::MassAssignment + end end diff --git a/webservice/lib/base_model/mass_assignment.rb b/webservice/lib/base_model/mass_assignment.rb index ce5dd52..b90ce0d 100644 --- a/webservice/lib/base_model/mass_assignment.rb +++ b/webservice/lib/base_model/mass_assignment.rb @@ -2,7 +2,35 @@ module BaseModel module MassAssignment def load(attributes) attributes.each do |k,v| - instance_variable_set ( "@#{k.to_s}",v ) + whitelist = self.class.accessible_attributes + next if whitelist && !(whitelist.include?(k.to_sym)) + blacklist = self.class.protected_attributes + next if blacklist && blacklist.include?(k.to_sym) + instance_variable_set("@#{k.to_s}",v) + end + end + + def self.included(base) + base.send(:extend,ClassMethods) + end + + module ClassMethods + def attr_accessible ( *args ) + @attr_accessible ||= [] + @attr_accessible.concat args + end + + def accessible_attributes + @attr_accessible + end + + def attr_protected ( *args ) + @attr_protected ||= [] + @attr_protected.concat args + end + + def protected_attributes + @attr_protected end end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 977c364..edde777 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -6,11 +6,22 @@ class BaseModelTest < ActiveSupport::TestCase before_save :call attr_accessor :arg1, :arg2, :callback_used + attr_protected :callback_used def call @callback_used = true; end end + class Test2 < BaseModel::Base + + attr_accessor :arg1, :arg2 + attr_accessible :arg1 + def call + @callback_used = true; + end + end + + def test_validations test = Test.new test.arg1 = "last" @@ -28,11 +39,18 @@ class BaseModelTest < ActiveSupport::TestCase assert test.callback_used end -MASS_DATA = { :arg1 => "last", :arg2 => "5" } +MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } def test_mass_assignment test = Test.new + test.callback_used = true test.load MASS_DATA assert_equal "last", test.arg1 assert_equal "5", test.arg2 +#test blacklisting + assert test.callback_used +#test whitelisting + test2 = Test2.new(MASS_DATA) + assert_equal "last", test2.arg1 + assert test2.arg2.nil? end end -- 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] <rest-service> master : add mass assignments whitelisting and blacklisting
by Josef Reidinger 09 Dec '09

09 Dec '09

ref: refs/heads/master commit 1ece5a70882938519f0748636e3de70ca7323eda Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Wed Dec 9 10:51:51 2009 +0100 add mass assignments whitelisting and blacklisting --- webservice/lib/base_model/base.rb | 14 +++++++++++- webservice/lib/base_model/mass_assignment.rb | 30 +++++++++++++++++++++++++- webservice/test/unit/base_model_test.rb | 20 ++++++++++++++++- 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index e1387e1..f9ed7f3 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -1,5 +1,8 @@ module BaseModel class Base + def initialize(attr={}) + load(attr) + end def save create_or_update @@ -29,9 +32,18 @@ module BaseModel def destroy end - include BaseModel::MassAssignment +#remove overwritten method_missing from activeRecord + alias :method_missing_orig :method_missing include ActiveRecord::AttributeMethods + alias :method_missing :method_missing_orig +#remove overwritten respond_to + alias :respond_to? :respond_to_without_attributes? + include ActiveRecord::Validations include ActiveRecord::Callbacks + + + include BaseModel::MassAssignment + end end diff --git a/webservice/lib/base_model/mass_assignment.rb b/webservice/lib/base_model/mass_assignment.rb index ce5dd52..b90ce0d 100644 --- a/webservice/lib/base_model/mass_assignment.rb +++ b/webservice/lib/base_model/mass_assignment.rb @@ -2,7 +2,35 @@ module BaseModel module MassAssignment def load(attributes) attributes.each do |k,v| - instance_variable_set ( "@#{k.to_s}",v ) + whitelist = self.class.accessible_attributes + next if whitelist && !(whitelist.include?(k.to_sym)) + blacklist = self.class.protected_attributes + next if blacklist && blacklist.include?(k.to_sym) + instance_variable_set("@#{k.to_s}",v) + end + end + + def self.included(base) + base.send(:extend,ClassMethods) + end + + module ClassMethods + def attr_accessible ( *args ) + @attr_accessible ||= [] + @attr_accessible.concat args + end + + def accessible_attributes + @attr_accessible + end + + def attr_protected ( *args ) + @attr_protected ||= [] + @attr_protected.concat args + end + + def protected_attributes + @attr_protected end end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 977c364..edde777 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -6,11 +6,22 @@ class BaseModelTest < ActiveSupport::TestCase before_save :call attr_accessor :arg1, :arg2, :callback_used + attr_protected :callback_used def call @callback_used = true; end end + class Test2 < BaseModel::Base + + attr_accessor :arg1, :arg2 + attr_accessible :arg1 + def call + @callback_used = true; + end + end + + def test_validations test = Test.new test.arg1 = "last" @@ -28,11 +39,18 @@ class BaseModelTest < ActiveSupport::TestCase assert test.callback_used end -MASS_DATA = { :arg1 => "last", :arg2 => "5" } +MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } def test_mass_assignment test = Test.new + test.callback_used = true test.load MASS_DATA assert_equal "last", test.arg1 assert_equal "5", test.arg2 +#test blacklisting + assert test.callback_used +#test whitelisting + test2 = Test2.new(MASS_DATA) + assert_equal "last", test2.arg1 + assert test2.arg2.nil? end end -- 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] r60007 - in /trunk/storage: storage/src/modules/Storage.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 08 Dec '09

08 Dec '09

Author: aschnell Date: Tue Dec 8 18:43:45 2009 New Revision: 60007 URL: http://svn.opensuse.org/viewcvs/yast?rev=60007&view=rev Log: - adapted getFreeInfo call to new libstorage Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in 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 Tue Dec 8 18:43:45 2009 @@ -810,11 +810,12 @@ integer df_free = 0; boolean win_disk = false; boolean efi = false; + boolean home = false; boolean r = false; r = LibStorage::StorageInterface::getFreeInfo( sint, device, resize_free, df_free, used, win_disk, - efi, used_fs==`ntfs ); + efi, home, used_fs==`ntfs ); resize_free = resize_free * 1024; // Byte df_free = df_free * 1024; // Byte Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Tue Dec 8 18:43:45 2009 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.2 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.3 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7 -- 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] <web-client> backgroud_patches_bnc550934 : read system status summary at background, display progress
by Ladislav Slezak 08 Dec '09

08 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 7f104b950a3ca5fb21461664665d7606e2229af8 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 8 18:31:00 2009 +0100 read system status summary at background, display progress --- .../status/app/controllers/status_controller.rb | 37 +++++++++++++++++--- .../app/views/status/_status_progress.html.erb | 26 ++++++++++++++ webclient/app/views/controlpanel/index.rhtml | 2 +- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index 1202af1..1c7b698 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -93,17 +93,23 @@ class StatusController < ApplicationController } end - def create_data + def create_data(from = nil, till = nil, background = false) @limits_list = Hash.new @limits_list[:reached] = String.new @data_group = Hash.new status = [] - till = Time.new - from = till - 300 #last 5 minutes + till ||= Time.new + from ||= till - 300 #last 5 minutes ActionController::Base.benchmark("Status data read from the server") do - status = @client.find(:dummy_param, :params => { :start => from.to_i.to_s, :stop => till.to_i.to_s }) + stat_params = { :start => from.to_i.to_s, :stop => till.to_i.to_s } + stat_params[:background] = "true" if background + status = @client.find(:dummy_param, :params => stat_params ) end + + # this is a background status result + return status.attributes if status.attributes.keys.sort == ["progress", "status", "subprogress"] + create_data_map status # logger.debug @data_group.inspect @@ -176,7 +182,28 @@ class StatusController < ApplicationController def show_summary return unless client_permissions begin - if create_data + till = params['till'] + from = params['from'] + + till ||= Time.new.to_i + from ||= till - 300 #last 5 minutes + + result = create_data(from, till, !params['background'].nil?) + + # is it a background progress? + if result.class == Hash + status_progress = result.symbolize_keys + Rails.logger.debug "Received background status progress: #{status_progress.inspect}" + + respond_to do |format| + format.html { render :partial => 'status_progress', :locals => {:status => status_progress, :from => from, :till => till } } + format.json { render :json => status_progress } + end + + return + end + + if result status = limits_reached status = (_("Limits exceeded for %s") % status) unless status.empty? else diff --git a/plugins/status/app/views/status/_status_progress.html.erb b/plugins/status/app/views/status/_status_progress.html.erb new file mode 100644 index 0000000..8624d9e --- /dev/null +++ b/plugins/status/app/views/status/_status_progress.html.erb @@ -0,0 +1,26 @@ + +<div class="status_summary"> + <div style="float: left;"> + <%= image_tag("/images/working.gif", :height=>"32", :width=>"32", :border=>"0") %> + </div> + + <div style="float: left; padding-left: 1em; padding-top:10px"> + <%= _("Reading system status") %> + </div> + + <div style="float: left; padding-left: 1em; padding-top:10px"> +  + <div style="float: left; width: 150px; text-align: center"><%= status[:progress].to_i -%>%</div> + <div style="border-style: solid; border-width: 1px; width: 150px; height: 1.2em;"> + <div style="background: #66CC00; width: <%= status[:progress].to_i -%>%; height: 1.2em;"/> + </div> + </div> + +  + <% javascript_tag do -%> + setTimeout(function() { + <%= remote_function(:update => "status_status", + :url => { :controller => :status, :action => :show_summary, :background => true, :from => from, :till => till }) %> + }, 2000); + <% end -%> +</div> diff --git a/webclient/app/views/controlpanel/index.rhtml b/webclient/app/views/controlpanel/index.rhtml index 9c560b1..6247677 100644 --- a/webclient/app/views/controlpanel/index.rhtml +++ b/webclient/app/views/controlpanel/index.rhtml @@ -16,7 +16,7 @@ <% javascript_tag do -%> $(document).ready( function() { <%= remote_function(:update => "status_status", - :url => { :controller => :status, :action => :show_summary }) %> + :url => { :controller => :status, :action => :show_summary, :background => true }) %> }); <% end -%> <% end %> -- 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] <rest-service> backgroud_patches_bnc550934 : optionally read system status at background
by Ladislav Slezak 08 Dec '09

08 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit a1c7d511a32fa2793e50d3ed4addb54574d26ca4 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Tue Dec 8 18:26:08 2009 +0100 optionally read system status at background --- plugins/patches/app/models/background_status.rb | 2 +- .../status/app/controllers/status_controller.rb | 5 +- plugins/status/lib/status.rb | 92 +++++++++++++++++++- 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/plugins/patches/app/models/background_status.rb b/plugins/patches/app/models/background_status.rb index 23966cf..2625cb6 100644 --- a/plugins/patches/app/models/background_status.rb +++ b/plugins/patches/app/models/background_status.rb @@ -2,7 +2,7 @@ class BackgroundStatus - attr_writer :status, + attr_accessor :status, :progress, :subprogress diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index d649e7a..a57fe11 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -82,10 +82,13 @@ class StatusController < ApplicationController # GET /status/1 # GET /status/1.xml def show + bgr = params['background'] + Rails.logger.info "Reading status in background" if bgr + permission_check("org.opensuse.yast.system.status.read") @status = Status.new stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) - @status.collect_data(start, stop, params[:data]) + @status.collect_data(start, stop, params[:data], bgr) end end diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index e34815d..1bcdabe 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -10,7 +10,18 @@ class Status :metrics, :limits + # currently running status requests in background (current states) + @@running = Hash.new + # finished requests (actual results) + @@done = Hash.new + # a mutex which guards access to the shared class variables above + @@mutex = Mutex.new + def to_xml(options = {}) + if @data.class == Hash && @data.size == 1 && @data[:progress].class == BackgroundStatus + return @data[:progress].to_xml + end + xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -141,23 +152,99 @@ class Status def draw_graph(heigth=nil, width=nil) end + # this is a wrapper to collect_data + def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}, background = false) + # background reading doesn't work correctly if class reloading is active + # (static class members are lost between requests) + if background && !Rails.configuration.cache_classes + Rails.logger.info "Class reloading is active, cannot use background thread (set config.cache_classes = true)" + background = false + end + + if background + # background status + bs = nil + key = start.to_i.to_s + '_' + stop.to_i.to_s + '_' + data.to_s + @@mutex.synchronize do + if @@done.has_key?(key) + Rails.logger.debug "Request #{key} is done" + @data = @@done.delete key + @data.delete :progress + return @data + end + + running = @@running[key] + if running + Rails.logger.debug "Request #{key} is already running: #{running.inspect}" + @data = {:progress => running} + return @data + end + + bs = BackgroundStatus.new + @@running[key] = bs + end + + # read the status in a separate thread + Thread.new do + Rails.logger.info '*** Background thread for reading status started...' + res = collect_status_data(start, stop, data, bs) + @@mutex.synchronize do + @@running.delete(key) + @@done[key] = res + end + Rails.logger.info '*** Finishing background status thread' + end + + # return current progress + @data = {:progress => bs} + return @data + else + collect_status_data(start, stop, data) + end + end + # creates several metrics for a defined period - def collect_data(start=nil, stop=nil, data = %w{cpu memory disk}) + def collect_status_data(start=nil, stop=nil, data = %w{cpu memory disk}, progress=nil) + metrics = available_metrics #puts metrics.inspect result = Hash.new if @collectd_running - case data + current_step = 0 if progress + case data when nil, "all", "All" # all metrics + if progress + total_steps = metrics.size + end + metrics.each_pair do |m, n| + if progress + @@mutex.synchronize do + progress.status = m.to_s + progress.progress = 100 * current_step / total_steps + Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + end + end + metrics[m][:rrds].each do |rrdb| result[File.basename(rrdb).chomp('.rrd')] = fetch_metric(rrdb, start, stop) end @data[m] = result result = Hash.new + + current_step += 1 if progress end else # only metrics in data + total_steps = data.size if progress data.each do |d| + if progress + @@mutex.synchronize do + progress.status = d.to_s + progress.progress = 100 * current_step / total_steps + Rails.logger.debug "*** Reading status: #{progress.status}: #{progress.progress}%" + end + end + metrics.each_pair do |m, n| if m.include?(d) metrics[m][:rrds].each do |rrdb| @@ -167,6 +254,7 @@ class Status result = Hash.new end end + current_step += 1 if progress end end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0