Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2015-01-29 09:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2015-01-27 10:50:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2015-01-29 09:55:13.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Jan 27 14:16:20 UTC 2015 - [email protected] + +- fixed \r, \f, \v and \b characters lost during conversion to + Ruby + +------------------------------------------------------------------- +Tue Jan 27 11:51:54 UTC 2015 - [email protected] + +- Removed more icons from other dialogs (bnc#875201) +- 3.1.119 + +------------------------------------------------------------------- Old: ---- yast2-3.1.118.tar.bz2 New: ---- yast2-3.1.119.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.3yGpc3/_old 2015-01-29 09:55:14.000000000 +0100 +++ /var/tmp/diff_new_pack.3yGpc3/_new 2015-01-29 09:55:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.118 +Version: 3.1.119 Release: 0 Url: https://github.com/yast/yast-yast2 @@ -44,6 +44,8 @@ # For running RSpec tests during build BuildRequires: rubygem(rspec) +# To have specific RSpec extensions available +BuildRequires: yast2-ruby-bindings >= 3.1.26 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq ++++++ yast2-3.1.118.tar.bz2 -> yast2-3.1.119.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/.travis.yml new/yast2-3.1.119/.travis.yml --- old/yast2-3.1.118/.travis.yml 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/.travis.yml 2015-01-28 15:01:11.000000000 +0100 @@ -7,11 +7,10 @@ - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh - sh ./travis_setup.sh -p "rake yast2-core yast2-devtools yast2-testsuite yast2-ruby-bindings yast2 yast2-pkg-bindings" -g "rspec:2.14.1 yast-rake gettext rubocop:0.28.0" script: - - rake check:syntax - rake check:pot - rubocop - - make -f Makefile.cvs - - make - - sudo make install - - make check + - make -s -f Makefile.cvs + - make -s + - sudo make -s install + - make -s check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/general/test/agents_test/netd_agent_test.rb new/yast2-3.1.119/library/general/test/agents_test/netd_agent_test.rb --- old/yast2-3.1.118/library/general/test/agents_test/netd_agent_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/general/test/agents_test/netd_agent_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -3,17 +3,13 @@ module Yast describe ".etc.xinetd_conf.services" do - before :each do + around :each do |example| root = File.join(File.dirname(__FILE__), "test_root") - assign_root_path(root) - end - - after :each do - reset_root_path + change_scr_root(root, &example) end describe ".Read" do - let(:content) { SCR.Read(Path.new(".etc.xinetd_conf.services")) } + let(:content) { SCR.Read(path(".etc.xinetd_conf.services")) } it "reads content of /etc/xinetd.d and returns array" do expect(content).to be_a(Array) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/general/test/agents_test/proc_meminfo_agent_test.rb new/yast2-3.1.119/library/general/test/agents_test/proc_meminfo_agent_test.rb --- old/yast2-3.1.118/library/general/test/agents_test/proc_meminfo_agent_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/general/test/agents_test/proc_meminfo_agent_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -4,17 +4,13 @@ require "yast" describe ".proc.meminfo" do - before :each do + around :each do |example| root = File.join(File.dirname(__FILE__), "test_root") - assign_root_path(root) - end - - after :each do - reset_root_path + change_scr_root(root, &example) end describe ".Read" do - let(:content) { Yast::SCR.Read(Yast::Path.new(".proc.meminfo")) } + let(:content) { Yast::SCR.Read(path(".proc.meminfo")) } it "read content of /proc/meminfo return hash" do expect(content).to be_a(Hash) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/general/test/event_dispatcher_test.rb new/yast2-3.1.119/library/general/test/event_dispatcher_test.rb --- old/yast2-3.1.118/library/general/test/event_dispatcher_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/general/test/event_dispatcher_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -4,7 +4,7 @@ require "ui/event_dispatcher" -class TestDialog +class DispatcherTestDialog include Yast::UIShortcuts include UI::EventDispatcher Yast.import "UI" @@ -38,7 +38,7 @@ end describe UI::EventDispatcher do - subject { TestDialog.new } + subject { DispatcherTestDialog.new } def mock_ui_events(*events) allow(Yast::UI).to receive(:UserInput).and_return(*events) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/general/test/test_helper.rb new/yast2-3.1.119/library/general/test/test_helper.rb --- old/yast2-3.1.118/library/general/test/test_helper.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/general/test/test_helper.rb 2015-01-28 15:01:12.000000000 +0100 @@ -3,13 +3,4 @@ ENV["Y2DIR"] = inc_dirs.join(":") require "yast" - -def assign_root_path(directory) - check_version = false - handle = Yast::WFM.SCROpen("chroot=#{directory}:scr", check_version) - Yast::WFM.SCRSetDefault(handle) -end - -def reset_root_path - Yast::WFM.SCRClose(Yast::WFM.SCRGetDefault) -end +require "yast/rspec" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/packages/src/modules/PackageCallbacks.rb new/yast2-3.1.119/library/packages/src/modules/PackageCallbacks.rb --- old/yast2-3.1.118/library/packages/src/modules/PackageCallbacks.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/packages/src/modules/PackageCallbacks.rb 2015-01-28 15:01:12.000000000 +0100 @@ -54,7 +54,6 @@ Yast.import "CommandLine" Yast.import "String" Yast.import "Report" - Yast.import "Icon" Yast.import "Wizard" Yast.import "Progress" Yast.import "FileUtils" @@ -80,7 +79,7 @@ @provide_aborted = false @source_aborted = false - @back_string = "" + @back_string = "\b\b\b\b\b\b\b\b\b\b" @clear_string = Ops.add(Ops.add(@back_string, " "), @back_string) # max. length of the text in the repository popup window @@ -292,12 +291,7 @@ dialog_layout = VBox( HSpacing(50), # enforce width VSpacing(0.1), - HBox( - # maybe more icon types could be used - # "info, "warning", "error" - Icon.Image("warning", "margin_right" => 2), - Left(Label(message)) - ), + Left(Label(message)), VSpacing(0.1), HBox( HSpacing(0.6), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/runlevel/test/service_test.rb new/yast2-3.1.119/library/runlevel/test/service_test.rb --- old/yast2-3.1.118/library/runlevel/test/service_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/runlevel/test/service_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -35,7 +35,7 @@ end it "returns the result of the original result of the command call" do - expect(Service.call("status", "sshd")).to be_kind_of(String) + expect(Service.call("status", "sshd")).to be_kind_of(::String) stub_service_with(:"try_restart", false) expect(Service.call("try-restart", "sshd")).to be_false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/system/test/hw_detection_test.rb new/yast2-3.1.119/library/system/test/hw_detection_test.rb --- old/yast2-3.1.118/library/system/test/hw_detection_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/system/test/hw_detection_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -1,7 +1,6 @@ #!/usr/bin/env rspec -require "yast" - +require_relative "test_helper" require_relative "../src/lib/yast2/hw_detection" describe "HwDetection" do @@ -33,22 +32,22 @@ describe "#memory" do it "returns detected memory size in bytes" do - Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([@memory]) + expect(Yast::SCR).to receive(:Read).with(path(".probe.memory")).and_return([@memory]) expect(Yast2::HwDetection.memory).to eq(@ramsize) end it "sums detected memory sizes" do - Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([@memory, @memory]) + expect(Yast::SCR).to receive(:Read).with(path(".probe.memory")).and_return([@memory, @memory]) expect(Yast2::HwDetection.memory).to eq(2 * @ramsize) end it "ignores non-memory devices" do - Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([@memory, @non_memory]) + expect(Yast::SCR).to receive(:Read).with(path(".probe.memory")).and_return([@memory, @non_memory]) expect(Yast2::HwDetection.memory).to eq(@ramsize) end it "raises exception when detection fails" do - Yast::SCR.should_receive(:Read).with(Yast::Path.new(".probe.memory")).and_return(nil) + expect(Yast::SCR).to receive(:Read).with(path(".probe.memory")).and_return(nil) expect { Yast2::HwDetection.memory }.to raise_error end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/system/test/kernel_test.rb new/yast2-3.1.119/library/system/test/kernel_test.rb --- old/yast2-3.1.118/library/system/test/kernel_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/system/test/kernel_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -1,24 +1,19 @@ #!/usr/bin/env rspec -top_srcdir = File.expand_path("../../../..", __FILE__) -inc_dirs = Dir.glob("#{top_srcdir}/library/*/src") -ENV["Y2DIR"] = inc_dirs.join(":") - -require "yast" +require_relative "test_helper" require "tmpdir" include Yast::Logger Yast.import "Kernel" Yast.import "FileUtils" -Yast.import "SCR" - -DEFAULT_DATA_DIR = File.join(File.expand_path(File.dirname(__FILE__)), "data/modules.d") describe "Kernel" do + let(:stubbed_modules_dir) { File.join(File.dirname(__FILE__), "data", "modules.d") } + before do log.info "--- test ---" - stub_const("Yast::KernelClass::MODULES_DIR", DEFAULT_DATA_DIR) + stub_const("Yast::KernelClass::MODULES_DIR", stubbed_modules_dir) @default_modules = { Yast::KernelClass::MODULES_CONF_FILE => [], "MODULES_LOADED_ON_BOOT.conf" => ["module-a", "module-b"], @@ -93,7 +88,7 @@ it "tries to create the missing directory and returns false if it fails" do expect(Yast::FileUtils).to receive(:Exists).twice.and_return(false) expect(Yast::SCR).to receive(:Execute).with( - Yast::Path.new(".target.mkdir"), + path(".target.mkdir"), anything ).and_return(false) expect(Yast::Kernel.SaveModulesToLoad).to eq(false) @@ -103,7 +98,7 @@ describe "when modules.d directory exists" do it "stores all modules to be loaded to configuration files and returns true" do Dir.mktmpdir do |tmpdir| - FileUtils.cp_r(DEFAULT_DATA_DIR + "/.", tmpdir) + FileUtils.cp_r(stubbed_modules_dir + "/.", tmpdir) stub_const("Yast::KernelClass::MODULES_DIR", tmpdir) Yast::Kernel.reset_modules_to_load diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/system/test/proc_cmdline_test.rb new/yast2-3.1.119/library/system/test/proc_cmdline_test.rb --- old/yast2-3.1.118/library/system/test/proc_cmdline_test.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/system/test/proc_cmdline_test.rb 2015-01-28 15:01:12.000000000 +0100 @@ -1,40 +1,40 @@ #!/usr/bin/env rspec -top_srcdir = File.expand_path("../../../..", __FILE__) -inc_dirs = Dir.glob("#{top_srcdir}/library/*/src") -ENV["Y2DIR"] = inc_dirs.join(":") - -require "yast" - -Yast.import "SCR" - -DEFAULT_DATA_DIR = File.join(File.expand_path(File.dirname(__FILE__)), "data") - -def assign_root_path(directory) - root = File.join(DEFAULT_DATA_DIR, directory) - desc = Yast::WFM.SCROpen("chroot=#{root}:scr", false) - Yast::WFM.SCRSetDefault(desc) -end +require_relative "test_helper" describe "SCR" do describe ".proc.cmdline" do describe "Read" do + let(:data_dir) { File.join(File.dirname(__FILE__), "data") } let(:expected_list) { %w(biosdevname=1 initrd=initrd install=hd:/// splash=silent) } - let(:read_list) { Yast::SCR.Read(Yast::Path.new(".proc.cmdline")).sort } + let(:read_list) { Yast::SCR.Read(path(".proc.cmdline")).sort } - it "parses correctly simple files" do - assign_root_path("cmdline-simple") - expect(read_list).to eq(expected_list) + around do |example| + change_scr_root(File.join(data_dir, chroot), &example) end - it "parses correctly files with two separators" do - assign_root_path("cmdline-twoseparators") - expect(read_list).to eq(expected_list) + context "processing a simple file" do + let(:chroot) { "cmdline-simple" } + + it "parses it correctly" do + expect(read_list).to eq(expected_list) + end end - it "parses correctly files with several lines" do - assign_root_path("cmdline-newlines") - expect(read_list).to eq(expected_list) + context "processing a file with two separators" do + let(:chroot) { "cmdline-twoseparators" } + + it "parses it correctly" do + expect(read_list).to eq(expected_list) + end + end + + context "processing a file with several lines" do + let(:chroot) { "cmdline-newlines" } + + it "parses it correctly" do + expect(read_list).to eq(expected_list) + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/system/test/test_helper.rb new/yast2-3.1.119/library/system/test/test_helper.rb --- old/yast2-3.1.118/library/system/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.119/library/system/test/test_helper.rb 2015-01-28 15:01:12.000000000 +0100 @@ -0,0 +1,6 @@ +top_srcdir = File.expand_path("../../../..", __FILE__) +inc_dirs = Dir.glob("#{top_srcdir}/library/*/src") +ENV["Y2DIR"] = inc_dirs.join(":") + +require "yast" +require "yast/rspec" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/types/src/modules/String.rb new/yast2-3.1.119/library/types/src/modules/String.rb --- old/yast2-3.1.118/library/types/src/modules/String.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/types/src/modules/String.rb 2015-01-28 15:01:12.000000000 +0100 @@ -44,7 +44,7 @@ @calnum = Ops.add(@calpha, @cdigit) @cpunct = "!\"\#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" @cgraph = Ops.add(@calnum, @cpunct) - @cspace = " \n\t" + @cspace = "\f\r\n\t\v" @cprint = Ops.add(@cspace, @cgraph) # 64 characters is the base undeline length @@ -491,14 +491,14 @@ # backslah sequences backslash_seq = { - "a" => "a", # alert - "b" => "", # backspace - "e" => "e", # escape - "f" => "", # FF + "a" => "\a", # alert + "b" => "\b", # backspace + "e" => "\e", # escape + "f" => "\f", # FF "n" => "\n", # NL - "r" => " ", # CR + "r" => "\r", # CR "t" => "\t", # tab - "v" => "v", # vertical tab + "v" => "\v", # vertical tab "\\" => "\\", # backslash # backslash will be removed later, # double quote and escaped double quote have to be different diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/wizard/src/modules/Confirm.rb new/yast2-3.1.119/library/wizard/src/modules/Confirm.rb --- old/yast2-3.1.118/library/wizard/src/modules/Confirm.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/wizard/src/modules/Confirm.rb 2015-01-28 15:01:12.000000000 +0100 @@ -41,7 +41,6 @@ textdomain "base" - Yast.import "Icon" Yast.import "Label" Yast.import "Mode" Yast.import "Popup" @@ -55,9 +54,13 @@ # Confirm hardware detection (only in manual installation) # @param [String] class hardware class (network cards) - # @param [String] icon_name name of the icon. If nil, generic hardware icon will be used + # @param [String] icon_name deprecated # @return true on continue def Detection(class_, icon_name) + if !icon_name.nil? + Builtins.y2warning(-1, "Parameter 'icon_name' is deprecated.") + end + return true if Linuxrc.manual != true # L3: no interaction in AY, just re-probe (bnc#568653) @@ -65,10 +68,6 @@ return true if Arch.s390 - icon_name = "yast-hardware" if icon_name.nil? - - icon = Icon.Image(icon_name, {}) - result = Ops.get(@detection_cache, class_) if !result.nil? Builtins.y2milestone( @@ -107,7 +106,7 @@ HVCenter( Label(_("YaST will detect the following hardware:")) ), - HVCenter(HBox(icon, HSpacing(0.5), Heading(class_))), + HVCenter(Heading(class_)), VSpacing(0.5) ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/library/wizard/src/modules/Progress.rb new/yast2-3.1.119/library/wizard/src/modules/Progress.rb --- old/yast2-3.1.118/library/wizard/src/modules/Progress.rb 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/library/wizard/src/modules/Progress.rb 2015-01-28 15:01:12.000000000 +0100 @@ -139,14 +139,6 @@ # stack with the running progresses # the top of the stack is the end of the list @progress_stack = [] - - @global_invisible_icons_definition = [] - @global_visible_icons_definition = [] - - @use_icons_in_progress = false - @has_icon_progress_bar = false - - @last_highlighted_icon = -1 end def IsRunning @@ -326,78 +318,6 @@ Id(Builtins.sformat("mark_stage_%1", i)) end - def IconId(i) - Builtins.sformat("mark_icon_%1", i) - end - - def FallbackIconInvisible - Ops.add(Directory.icondir, "32x32/apps/yast-sudo.png") - end - - def FallbackIconVisible - Ops.add(Directory.icondir, "32x32/apps/yast-scripts.png") - end - - def NormalizeIconPath(one_icon, visible) - if one_icon.nil? || one_icon == "" - one_icon = visible ? FallbackIconVisible() : FallbackIconInvisible() - end - - if !Builtins.regexpmatch(one_icon, ".[pP][nN][gG]$") && - !Builtins.regexpmatch(one_icon, ".[jJ][pP][gG]$") - one_icon = Ops.add(one_icon, ".png") - end - - # relative path (to Directory::icondir) - if Builtins.regexpmatch(one_icon, "/") && - !Builtins.regexpmatch(one_icon, "^/") - one_icon = Ops.add(Directory.icondir, one_icon) - # hopefully you know what you do - # just image name - elsif !Builtins.regexpmatch(one_icon, "/") - one_icon = Ops.add(Ops.add(Directory.icondir, "32x32/apps/"), one_icon) - end - - if !FileUtils.Exists(one_icon) - Builtins.y2error("Image %1 doesn't exist, using fallback", one_icon) - one_icon = visible ? FallbackIconVisible() : FallbackIconInvisible() - end - - one_icon - end - - def GenerateIdleIcons(number_of_stages) - display_info = UI.GetDisplayInfo - can_display_images = Ops.get_boolean( - display_info, - "HasImageSupport", - false - ) == true - - return Empty() if !can_display_images - - ret = HBox(HSpacing(2)) - i = -1 - - number_of_stages = Ops.subtract(number_of_stages, 1) - - while Ops.less_than(i, number_of_stages) - i = Ops.add(i, 1) - - one_icon = NormalizeIconPath( - Ops.get(@global_visible_icons_definition, i), - false - ) - ret = Builtins.add( - ret, - Image(Id(IconId(i)), Opt(:disabled), one_icon, "[X]") - ) - ret = Builtins.add(ret, HSpacing(2)) - end - - deep_copy(ret) - end - # New complex progress bar with stages. # @param [String] window_title title of the window # @param [String] progress_title title of the progress bar. Pass at least " " @@ -503,21 +423,10 @@ bar = Builtins.add(bar, Left(HBox(HSquash(items)))) if 0 != @steps - progress_icons = Empty() - if @use_icons_in_progress == true - Builtins.y2milestone("Using icons in progress") - progress_icons = GenerateIdleIcons(length) - @has_icon_progress_bar = true - else - Builtins.y2milestone("No progress icons defined") - @has_icon_progress_bar = false - end - bar = Builtins.add( bar, VBox( VStretch(), - progress_icons, ReplacePoint(Id(:subprogress_replace_point), Empty()), ReplacePoint( Id(:progress_replace_point), @@ -666,45 +575,20 @@ nil end - # Function adds icon-support to progress dialog. - # Parameters are the same as for Progress::New() function with one parameter added. - # + # @deprecated Use {#New} instead. + # Obsolete function adding icon-support to progress dialog. + # We don't use icons in popups any more. # @param [String] window_title # @param [String] progress_title # @param [Fixnum] length # @param [Array<String>] stg # @param [Array] tits # @param [String] help_textmap - # # @param [Array<Array<String>>] icons_definition - # - # - # **Structure:** - # - # icons_definition = $[ - # [ // first 'visible' - # "/path/to/icon-highlighted.png" - # "/path/to/another-icon-highlighted.png", - # ] - # [ // then 'invisible' - # "/path/to/icon-gryscale.png", - # nil, // fallback icon will be used - # ], - # ] - # # @see Function Progress::New() - def NewProgressIcons(window_title, progress_title, length, stg, tits, help_textmap, icons_definition) - stg = deep_copy(stg) - tits = deep_copy(tits) - icons_definition = deep_copy(icons_definition) - @global_visible_icons_definition = Ops.get(icons_definition, 0, []) - @global_invisible_icons_definition = Ops.get(icons_definition, 1, []) - - @use_icons_in_progress = true + def NewProgressIcons(window_title, progress_title, length, stg, tits, help_textmap, _icons_definition) + Builtins.y2warning(-1, "#{__method__} is deprecated. Use Progess::New instead!") New(window_title, progress_title, length, stg, tits, help_textmap) - @use_icons_in_progress = false - - nil end # Create simple progress bar with no stages, only with progress bar. @@ -718,30 +602,6 @@ nil end - # Highlights a progress icon (changes the dimmed one - # into a normal one). - # - # @param integer current step ID - def HighlightProgressIcon(step_id) - if @has_icon_progress_bar - @last_highlighted_icon = -1 if @last_highlighted_icon.nil? - - # some steps might have been skipped, change all (not changed yet) - # icons one by one - while Ops.less_than(@last_highlighted_icon, step_id) - @last_highlighted_icon = Ops.add(@last_highlighted_icon, 1) - - icon_id = IconId(@last_highlighted_icon) - - if UI.WidgetExists(Id(icon_id)) == true - UI.ChangeWidget(Id(icon_id), :Enabled, true) - end - end - end - - nil - end - # Uses current_step def UpdateProgressBar if Ops.greater_than(@current_step, @steps) @@ -756,10 +616,7 @@ progress_value = @current_step - # do not change icons in a nested progress - if StackSize() == 0 - HighlightProgressIcon(@current_step) - else + if StackSize() != 0 # recalculate the progress bar value according to the parent progress prev_state = TopState() prev_step = Ops.get_integer(prev_state, "current_step", 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/package/yast2.changes new/yast2-3.1.119/package/yast2.changes --- old/yast2-3.1.118/package/yast2.changes 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/package/yast2.changes 2015-01-28 15:01:12.000000000 +0100 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Jan 27 14:16:20 UTC 2015 - [email protected] + +- fixed \r, \f, \v and \b characters lost during conversion to + Ruby + +------------------------------------------------------------------- +Tue Jan 27 11:51:54 UTC 2015 - [email protected] + +- Removed more icons from other dialogs (bnc#875201) +- 3.1.119 + +------------------------------------------------------------------- Thu Jan 22 13:21:45 UTC 2015 - [email protected] - added handling of new created configuration files (bsc#860856) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.118/package/yast2.spec new/yast2-3.1.119/package/yast2.spec --- old/yast2-3.1.118/package/yast2.spec 2015-01-26 11:36:43.000000000 +0100 +++ new/yast2-3.1.119/package/yast2.spec 2015-01-28 15:01:12.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.118 +Version: 3.1.119 Release: 0 URL: https://github.com/yast/yast-yast2 @@ -41,6 +41,8 @@ # For running RSpec tests during build BuildRequires: rubygem(rspec) +# To have specific RSpec extensions available +BuildRequires: yast2-ruby-bindings >= 3.1.26 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
