Hello community, here is the log from the commit of package yast2-tune for openSUSE:Factory checked in at 2014-07-31 21:49:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-tune (Old) and /work/SRC/openSUSE:Factory/.yast2-tune.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-tune" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-tune/yast2-tune.changes 2014-05-15 19:08:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-tune.new/yast2-tune.changes 2014-07-31 21:49:08.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 30 11:04:38 UTC 2014 - [email protected] + +- filter out empty "unknown" SMBIOS entries (bnc#880643) +- fixed running X.org detection +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-tune-3.1.3.tar.bz2 New: ---- yast2-tune-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tune.spec ++++++ --- /var/tmp/diff_new_pack.BqUDML/_old 2014-07-31 21:49:10.000000000 +0200 +++ /var/tmp/diff_new_pack.BqUDML/_new 2014-07-31 21:49:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-tune -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-tune-3.1.3.tar.bz2 -> yast2-tune-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.1.3/package/yast2-tune.changes new/yast2-tune-3.1.4/package/yast2-tune.changes --- old/yast2-tune-3.1.3/package/yast2-tune.changes 2014-05-14 17:35:45.000000000 +0200 +++ new/yast2-tune-3.1.4/package/yast2-tune.changes 2014-07-30 16:00:44.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 30 11:04:38 UTC 2014 - [email protected] + +- filter out empty "unknown" SMBIOS entries (bnc#880643) +- fixed running X.org detection +- 3.1.4 + +------------------------------------------------------------------- Wed May 14 15:25:30 UTC 2014 - [email protected] - adapt to new bootloader kernel param API (bnc#869608) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.1.3/package/yast2-tune.spec new/yast2-tune-3.1.4/package/yast2-tune.spec --- old/yast2-tune-3.1.3/package/yast2-tune.spec 2014-05-14 17:35:45.000000000 +0200 +++ new/yast2-tune-3.1.4/package/yast2-tune.spec 2014-07-30 16:00:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-tune -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.1.3/src/clients/hwinfo.rb new/yast2-tune-3.1.4/src/clients/hwinfo.rb --- old/yast2-tune-3.1.3/src/clients/hwinfo.rb 2014-05-14 17:35:45.000000000 +0200 +++ new/yast2-tune-3.1.4/src/clients/hwinfo.rb 2014-07-30 16:00:44.000000000 +0200 @@ -10,6 +10,8 @@ # $Id$ module Yast class HwinfoClient < Client + include Yast::Logger + def main Yast.import "UI" @@ -113,14 +115,12 @@ # if xserver is running, don't probe for mouse and chipcard # because it has bad side effect (moving cursor) - if SCR.Execute(path(".target.bash"), "/bin/ps -C X") == 0 - Builtins.y2warning( - "X server is running - mouse and chipcard will not be probed" - ) - @exclude_list = Builtins.add(@exclude_list, path(".probe.mouse")) + if SCR.Execute(path(".target.bash"), "/bin/ps -C Xorg") == 0 + log.warn "X server is running - mouse and chipcard will not be probed" + @exclude_list << path(".probe.mouse") # .probe.chipcard has same effect as .probe.mouse - @exclude_list = Builtins.add(@exclude_list, path(".probe.chipcard")) + @exclude_list << path(".probe.chipcard") end nil @@ -212,6 +212,9 @@ if dir == nil val = SCR.Read(pat) + # SMBIOS entries cleanup + clean_bios_tree(val) if pat == path(".probe.bios") + if scalar(val) return Item( Builtins.sformat("%1: %2", trans_str(afterLast(p)), trans_bool(val)) @@ -263,10 +266,26 @@ nil end - - # Main + # remove empty nodes with type "unknown" from BIOS detection + # the removed items are Hashes like this: + # {"type" =>"unknown", "type_id" => 217} + def clean_bios_tree(bios_tree) + return unless bios_tree.is_a?(Array) + + bios_tree.each do |v| + next unless v.is_a?(Hash) + smbios = v["smbios"] + next unless smbios.is_a?(Array) + + log.info "smbios items: #{smbios.size}" + # do not remove the "unknown" items if there are some more data (size > 2) + smbios.reject!{ |node| node.is_a?(Hash) && node.size <= 2 && node["type"] == "unknown" } + log.info "smbios items after cleanup: #{smbios.size}" + end + end + # Main def StartGUI # display progress popup OpenProbingPopup() -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
