Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-tune -> sle12 Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-tune/yast2-tune.changes 2014-01-17 14:16:38.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-tune/yast2-tune.changes 2014-01-22 11:05:44.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Jan 22 09:46:23 UTC 2014 - lslezak@suse.cz + +- removed "Save to Floppy" option (nobody uses floppies anymore...) +- 3.1.1 + +------------------------------------------------------------------- +Wed Jan 22 08:59:57 UTC 2014 - jreidinger@suse.com + +- Improve usability of proposal in installer +- 3.1.0 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - installation-images - installation-images-extras - yast2-schema - yast2-tune ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-tune (Old) and /mounts/work_src_done/SLE12/yast2-tune (BS:build ID:31195 MAIL:yast-devel@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-tune", Maintainer is "yast-devel@opensuse.org" Old: ---- yast2-tune-3.0.4.tar.bz2 New: ---- yast2-tune-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-tune.spec ++++++ --- /var/tmp/diff_new_pack.s05r8L/_old 2014-01-27 16:10:00.000000000 +0100 +++ /var/tmp/diff_new_pack.s05r8L/_new 2014-01-27 16:10:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-tune -Version: 3.0.4 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,7 +25,7 @@ BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # hwinfo/classnames.ycp # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 ++++++ yast2-tune-3.0.4.tar.bz2 -> yast2-tune-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.0.4/VERSION new/yast2-tune-3.1.1/VERSION --- old/yast2-tune-3.0.4/VERSION 2013-11-15 13:16:46.000000000 +0100 +++ new/yast2-tune-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.0.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.0.4/package/yast2-tune.changes new/yast2-tune-3.1.1/package/yast2-tune.changes --- old/yast2-tune-3.0.4/package/yast2-tune.changes 2013-11-15 13:16:46.000000000 +0100 +++ new/yast2-tune-3.1.1/package/yast2-tune.changes 2014-01-27 11:50:58.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Jan 22 09:46:23 UTC 2014 - lslezak@suse.cz + +- removed "Save to Floppy" option (nobody uses floppies anymore...) +- 3.1.1 + +------------------------------------------------------------------- +Wed Jan 22 08:59:57 UTC 2014 - jreidinger@suse.com + +- Improve usability of proposal in installer +- 3.1.0 + +------------------------------------------------------------------- Wed Nov 13 15:56:18 UTC 2013 - jreidinger@suse.com - Add explicit COPYING file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.0.4/package/yast2-tune.spec new/yast2-tune-3.1.1/package/yast2-tune.spec --- old/yast2-tune-3.0.4/package/yast2-tune.spec 2013-11-15 13:16:46.000000000 +0100 +++ new/yast2-tune-3.1.1/package/yast2-tune.spec 2014-01-27 11:50:58.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-tune -Version: 3.0.4 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,7 +25,7 @@ BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 # hwinfo/classnames.ycp # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.0.4/src/clients/hwinfo_proposal.rb new/yast2-tune-3.1.1/src/clients/hwinfo_proposal.rb --- old/yast2-tune-3.0.4/src/clients/hwinfo_proposal.rb 2013-11-15 13:16:46.000000000 +0100 +++ new/yast2-tune-3.1.1/src/clients/hwinfo_proposal.rb 2014-01-27 11:50:58.000000000 +0100 @@ -22,8 +22,13 @@ # make proposal if @func == "MakeProposal" - @force_reset = Ops.get_boolean(@param, "force_reset", false) - @ret = { "raw_proposal" => InitHWinfo.MakeProposal(@force_reset) } + force_reset = Ops.get_boolean(@param, "force_reset", false) + InitHWinfo.MakeProposal(force_reset) + + @ret = { + "preformatted_proposal" => "<ul><li><a href=\"hwinfo_proposal\">System and Hardware Settings</a></li></ul>", + "links" => ["hwinfo_proposal"] + } # start configuration workflow elsif @func == "AskUser" @has_next = Ops.get_boolean(@param, "has_next", false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.0.4/src/clients/inst_hwinfo.rb new/yast2-tune-3.1.1/src/clients/inst_hwinfo.rb --- old/yast2-tune-3.0.4/src/clients/inst_hwinfo.rb 2013-11-15 13:16:46.000000000 +0100 +++ new/yast2-tune-3.1.1/src/clients/inst_hwinfo.rb 2014-01-27 11:50:58.000000000 +0100 @@ -72,65 +72,6 @@ deep_copy(@ret) end - # Show floppy selection dialog. - # @param [Hash{String => String}] devices map with pairs $["device name" : "model (description)"] - # @return [String] selected floppy device name or nil when canceled - def floppy_selection(devices) - devices = deep_copy(devices) - devs = Builtins.maplist(devices) do |d, m| - Item(Id(d), Builtins.sformat("%1 (%2)", m, d)) - end - - dialog = VBox( - # combo box label - ComboBox(Id(:device), _("&Floppy Disk Device"), devs), - VSpacing(1), - ButtonBox( - PushButton(Id(:ok), Label.OKButton), - PushButton(Id(:cancel), Label.CancelButton) - ) - ) - - ui = nil - - UI.OpenDialog(dialog) - - while ui != :ok && ui != :cancel && ui != :close - ui = Convert.to_symbol(UI.UserInput) - end - - # get selected device - selected = Convert.to_string(UI.QueryWidget(:device, :Value)) - - UI.CloseDialog - - # return nil if [OK] wasn't pressed - ui == :ok ? selected : nil - end - - # Select floppy device where hwifo will be stored. - # If more than one floppy device was found display - # selection dialog - # @return [String] floppy device name (e.g. /dev/fd0) or nil when no floppy was found - def selected_floppy - floppy_size = Builtins.size(InitHWinfo.floppy) - - if floppy_size == 0 - return nil - elsif floppy_size == 1 - device = "" - - # get device name - Builtins.foreach(InitHWinfo.floppy) { |dev, m| device = dev } - - return device - else - # there is more than 2 floppies in the system - # ask user which should be used - return floppy_selection(InitHWinfo.floppy) - end - end - # Show detail dialog for selected device # @param [String] model hardware description (used in the tree widget # as a root node) @@ -230,20 +171,7 @@ HSpacing(4), # push button label PushButton(Id(:details), _("&Details...")), - # FIXME: there should be only "Save to file" in Xen and UML system - !Arch.is_uml ? - # menu button label - MenuButton( - Id(:savemenu), - _("&Save to File"), - [ - # menu item - Item(Id(:file), _("Save to &File...")), - # menu item - Item(Id(:floppy), _("Save to F&loppy...")) - ] - ) : - Empty() + PushButton(Id(:file), _("Save to &File...")) ), VSpacing(1) ) @@ -257,11 +185,9 @@ "<P><B>Details</B><BR>Select a component and press <B>Details</B> to see a more detailed description of the component.</P>" ) + # help text - part 3/3 - (Arch.is_uml ? - "" : _( - "<P><B>Save to File</B><BR>You can save\n hardware information (<I>hwinfo</I> output) to a file or floppy disk. Select the target type in <B>Save to File</B>.</P>" - )) + "<P><B>Save to File</B><BR>You can save\n hardware information (<I>hwinfo</I> output) to a file.</P>" + ) Wizard.HideBackButton Wizard.HideAbortButton @@ -307,30 +233,6 @@ else ret = :dummy end - elsif ret == :floppy - save_device = selected_floppy - - if save_device != nil - Builtins.y2debug("Selected floppy: %1", save_device) - - # mount floppy - mpoint = mount_device(save_device) - - if mpoint != nil - save_hwinfo_to_file(Ops.add(mpoint, "/hwinfo.out")) - - # unmount floppy - umount_device(mpoint) - else - # error popup - mount failed, %1 is device file name (e.g. /dev/fd0) - Report.Error( - Builtins.sformat( - _("Floppy device '%1' cannot be mounted."), - save_device - ) - ) - end - end elsif ret == :file # save to file save_hwinfo_to_file("/hwinfo.out") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-tune-3.0.4/src/modules/InitHWinfo.rb new/yast2-tune-3.1.1/src/modules/InitHWinfo.rb --- old/yast2-tune-3.0.4/src/modules/InitHWinfo.rb 2013-11-15 13:16:46.000000000 +0100 +++ new/yast2-tune-3.1.1/src/modules/InitHWinfo.rb 2014-01-27 11:50:58.000000000 +0100 @@ -36,9 +36,6 @@ # list of detected devices @detectedHW = nil - - # default is "/dev/fd0" floppy device (used when floppy detection is skipped as a fallback) - @floppy = { "/dev/fd0" => _("Floppy disk") } end # Start hardware detection (only CPU and main memory) @@ -171,41 +168,9 @@ # Return short system description # @param [Boolean] reset If reset is true then always do hardware detection - # @return [Array](string) list of hardware desciptions + # @return [Boolean] if proposal succeed def MakeProposal(reset) Initialize(reset) - - # the installation proposal item - # %1 is processor name - ret = [ - Builtins.sformat(_("Processor: %1"), @cpu_string), - # the installation proposal item - # %1 is memory size string - Builtins.sformat( - _("Main Memory: %1"), - String.FormatSizeWithPrecision(@memory_size, 2, true) - ) - ] - - # add system string - if Ops.greater_than(Builtins.size(@system_string), 0) - # the installation proposal item - # %1 is system name - ret = Builtins.prepend( - ret, - Builtins.sformat(_("System: %1"), @system_string) - ) - end - - # add SysRq status line - if SystemSettings.GetSysRqKeysEnabled - # item in the installation proposal (displayed only when SysRq key is enabled - ret = Builtins.add(ret, _("SysRq Key: Enabled")) - end - - Builtins.y2milestone("proposal: %1", ret) - - deep_copy(ret) end # Detect all hardware present in the system @@ -308,24 +273,6 @@ :to => "list <map <string, any>>" ) - # store floppy devices, used in hwinfo output saving - if subpath == "floppy" - # reset list of floppies - @floppy = {} - - if result != nil && Ops.greater_than(Builtins.size(result), 0) - Builtins.foreach(result) do |f| - device = Ops.get_string(f, "dev_name") - model = Ops.get_string(f, "model") - if device != nil && model != nil - Ops.set(@floppy, device, model) - end - end - end - - Builtins.y2milestone("Detected floppy devices: %1", @floppy) - end - if Ops.greater_than(Builtins.size(result), 0) Builtins.foreach(result) do |info| # device name (CPU model name string has key "name" instead of "model") @@ -357,9 +304,8 @@ deep_copy(@detectedHW) end - publish :variable => :floppy, :type => "map <string, string>" publish :function => :Initialize, :type => "boolean (boolean)" - publish :function => :MakeProposal, :type => "list <string> (boolean)" + publish :function => :MakeProposal, :type => "boolean (boolean)" publish :function => :DetectedHardware, :type => "list <map> (boolean, block <boolean>)" end continue with "q"... Checked in at Mon Jan 27 16:10:15 CET 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org