Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-07-30 07:34:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-07-26 12:20:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-07-30 07:35:00.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Jul 29 13:30:04 UTC 2014 - jreidinger@suse.com + +- Fix timing of slideshow - now slides goes in cycle and all have + equal time to display which improve user experience (bnc#885973) +- 3.1.90 + +------------------------------------------------------------------- +Tue Jul 29 08:09:27 UTC 2014 - ancor@suse.com + +- Fixed .proc.cmdline parsing to support more situations + (bnc#889241) +- 3.1.89 + +------------------------------------------------------------------- +Tue Jul 29 06:46:55 UTC 2014 - jreidinger@suse.com + +- fix hidding cd statistics in text only mode (bnc#864507) +- 3.1.88 + +------------------------------------------------------------------- Old: ---- yast2-3.1.87.tar.bz2 New: ---- yast2-3.1.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.YpE5qD/_old 2014-07-30 07:35:01.000000000 +0200 +++ /var/tmp/diff_new_pack.YpE5qD/_new 2014-07-30 07:35:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.87 +Version: 3.1.90 Release: 0 Url: https://github.com/yast/yast-yast2 @@ -100,8 +100,8 @@ Conflicts: yast2-installation < 2.18.5 Conflicts: yast2-update < 2.16.1 -# Modules 'Slides' and 'SlideShow' moved from yast2-packager to yast2 -Conflicts: yast2-packager < 2.17.12 +# Older packager use removed API +Conflicts: yast2-packager < 3.1.34 Conflicts: yast2-mouse < 2.16.0 Conflicts: autoyast2-installation < 2.16.2 # country_long.ycp and country.ycp moved to yast2 ++++++ yast2-3.1.87.tar.bz2 -> yast2-3.1.90.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/general/test/Makefile.am new/yast2-3.1.90/library/general/test/Makefile.am --- old/yast2-3.1.87/library/general/test/Makefile.am 2014-07-25 18:57:09.000000000 +0200 +++ new/yast2-3.1.90/library/general/test/Makefile.am 2014-07-29 16:02:44.000000000 +0200 @@ -1,9 +1,10 @@ TESTS = \ asciifile_test.rb \ - linuxrc_test.rb \ hooks_test.rb \ + linuxrc_test.rb \ os_release_test.rb \ - popup_test.rb + popup_test.rb \ + agents_test/proc_meminfo_agent_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/general/test/agents_test/proc_meminfo_agent_test.rb new/yast2-3.1.90/library/general/test/agents_test/proc_meminfo_agent_test.rb --- old/yast2-3.1.87/library/general/test/agents_test/proc_meminfo_agent_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.90/library/general/test/agents_test/proc_meminfo_agent_test.rb 2014-07-29 16:02:44.000000000 +0200 @@ -0,0 +1,34 @@ +require_relative "../test_helper" +require "yast" + +describe ".proc.meminfo" do + + AGENT_PATH = Yast::Path.new(".proc.meminfo") + before :each do + root = File.join(File.dirname(__FILE__), "test_root") + check_version = false + handle = Yast::WFM.SCROpen("chroot=#{root}:scr", check_version) + Yast::WFM.SCRSetDefault(handle) + end + + after :each do + Yast::WFM.SCRClose(Yast::WFM.SCRGetDefault) + end + + describe ".Read" do + it "read content of /proc/meminfo return hash" do + content = Yast::SCR.Read(AGENT_PATH) + expect(content).to be_a(Hash) + end + + it "returned hash contain memtotal key" do + content = Yast::SCR.Read(AGENT_PATH) + expect(content).to include("memtotal" => 1021032) + end + + it "returned hash contain memfree key" do + content = Yast::SCR.Read(AGENT_PATH) + expect(content).to include("memfree" => 83408) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/general/test/agents_test/test_root/proc/meminfo new/yast2-3.1.90/library/general/test/agents_test/test_root/proc/meminfo --- old/yast2-3.1.87/library/general/test/agents_test/test_root/proc/meminfo 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.90/library/general/test/agents_test/test_root/proc/meminfo 2014-07-29 16:02:44.000000000 +0200 @@ -0,0 +1,42 @@ +MemTotal: 1021032 kB +MemFree: 83408 kB +Buffers: 215132 kB +Cached: 278812 kB +SwapCached: 1280 kB +Active: 353916 kB +Inactive: 395504 kB +Active(anon): 88012 kB +Inactive(anon): 171404 kB +Active(file): 265904 kB +Inactive(file): 224100 kB +Unevictable: 0 kB +Mlocked: 0 kB +SwapTotal: 514072 kB +SwapFree: 471668 kB +Dirty: 28 kB +Writeback: 0 kB +AnonPages: 254412 kB +Mapped: 27508 kB +Shmem: 3940 kB +Slab: 151292 kB +SReclaimable: 127604 kB +SUnreclaim: 23688 kB +KernelStack: 2200 kB +PageTables: 21072 kB +NFS_Unstable: 0 kB +Bounce: 0 kB +WritebackTmp: 0 kB +CommitLimit: 1024588 kB +Committed_AS: 813988 kB +VmallocTotal: 34359738367 kB +VmallocUsed: 3512 kB +VmallocChunk: 34359734775 kB +HardwareCorrupted: 0 kB +AnonHugePages: 22528 kB +HugePages_Total: 0 +HugePages_Free: 0 +HugePages_Rsvd: 0 +HugePages_Surp: 0 +Hugepagesize: 2048 kB +DirectMap4k: 49144 kB +DirectMap2M: 999424 kB diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/packages/src/modules/SlideShow.rb new/yast2-3.1.90/library/packages/src/modules/SlideShow.rb --- old/yast2-3.1.87/library/packages/src/modules/SlideShow.rb 2014-07-25 18:57:09.000000000 +0200 +++ new/yast2-3.1.90/library/packages/src/modules/SlideShow.rb 2014-07-29 16:02:44.000000000 +0200 @@ -136,9 +136,7 @@ @current_slide_no = 0 @slide_start_time = 0 - @slide_min_interval = 30 # const - minimum seconds between slide changes - @slide_max_interval = 3 * 60 # const - maximum seconds between slide changes - @slide_interval = @slide_min_interval + @slide_interval = 30 # FIXME constant @language = "en" @widgets_created = false @user_switched_to_details = false @@ -464,7 +462,8 @@ # @param [Fixnum] slide_no number of slide to load # def LoadSlide(slide_no) - slide_no = 0 if Ops.greater_than(slide_no, Builtins.size(Slides.slides)) + slide_no = 0 if slide_no >= Slides.slides.size + log.info "load slide #{slide_no}" @current_slide_no = slide_no @@ -481,16 +480,8 @@ # necessary. # def ChangeSlideIfNecessary - if Ops.less_than( - Ops.add(@current_slide_no, 1), - Builtins.size(Slides.slides) - ) && - Ops.greater_than( - Builtins.time, - Ops.add(@slide_start_time, @slide_interval) - ) - Builtins.y2debug("Loading slide #%1", Ops.add(@current_slide_no, 2)) - LoadSlide(Ops.add(@current_slide_no, 1)) + if Builtins.time > (@slide_start_time + @slide_interval) + LoadSlide(@current_slide_no + 1) end nil @@ -611,7 +602,7 @@ # Rebuild the details page. def RebuildDetailsView if UI.WidgetExists(:tabContents) - UI.ChangeWidget(:dumbTab, :CurrentItem, :showDetails) + UI.ChangeWidget(:dumbTab, :CurrentItem, :showDetails) if UI.WidgetExists(:dumbTab) UI.ReplaceWidget(:tabContents, DetailsPageWidgets()) Builtins.y2milestone("Contents set to details") end @@ -716,8 +707,8 @@ ) ) else - # no tabs - contents = DetailsPageWidgets() + # no tabs, but we need to modify hide cd statistics table, so add replace point + contents = ReplacePoint(Id(:tabContents), DetailsPageWidgets()) end Builtins.y2milestone("SlideShow contents: %1", contents) @@ -784,7 +775,7 @@ # Initialize generic data to default values def Reset - @current_slide_no = 0 + @current_slide_no = -1 @slide_start_time = 0 @total_time_elapsed = 0 @start_time = -1 @@ -1058,8 +1049,6 @@ publish :variable => :next_recalc_time, :type => "integer" publish :variable => :current_slide_no, :type => "integer" publish :variable => :slide_start_time, :type => "integer" - publish :variable => :slide_min_interval, :type => "integer" - publish :variable => :slide_max_interval, :type => "integer" publish :variable => :slide_interval, :type => "integer" publish :variable => :language, :type => "string" publish :variable => :widgets_created, :type => "boolean" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/system/src/scrconf/proc_cmdline.scr new/yast2-3.1.90/library/system/src/scrconf/proc_cmdline.scr --- old/yast2-3.1.87/library/system/src/scrconf/proc_cmdline.scr 2014-07-25 18:57:09.000000000 +0200 +++ new/yast2-3.1.90/library/system/src/scrconf/proc_cmdline.scr 2014-07-29 16:02:44.000000000 +0200 @@ -21,8 +21,8 @@ "#\n", // comment true, // read-only (`List( - `String("^ \n"), - " " + `String("^ \n\t"), + `Separator(" \n\t") )) ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/system/test/data/cmdline-newlines/proc/cmdline new/yast2-3.1.90/library/system/test/data/cmdline-newlines/proc/cmdline --- old/yast2-3.1.87/library/system/test/data/cmdline-newlines/proc/cmdline 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.90/library/system/test/data/cmdline-newlines/proc/cmdline 2014-07-29 16:02:44.000000000 +0200 @@ -0,0 +1,2 @@ +initrd=initrd splash=silent +install=hd:/// biosdevname=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/system/test/data/cmdline-simple/proc/cmdline new/yast2-3.1.90/library/system/test/data/cmdline-simple/proc/cmdline --- old/yast2-3.1.87/library/system/test/data/cmdline-simple/proc/cmdline 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.90/library/system/test/data/cmdline-simple/proc/cmdline 2014-07-29 16:02:44.000000000 +0200 @@ -0,0 +1 @@ +initrd=initrd splash=silent install=hd:/// biosdevname=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/system/test/data/cmdline-twoseparators/proc/cmdline new/yast2-3.1.90/library/system/test/data/cmdline-twoseparators/proc/cmdline --- old/yast2-3.1.87/library/system/test/data/cmdline-twoseparators/proc/cmdline 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.90/library/system/test/data/cmdline-twoseparators/proc/cmdline 2014-07-29 16:02:44.000000000 +0200 @@ -0,0 +1 @@ +initrd=initrd splash=silent install=hd:/// biosdevname=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/library/system/test/proc_cmdline_test.rb new/yast2-3.1.90/library/system/test/proc_cmdline_test.rb --- old/yast2-3.1.87/library/system/test/proc_cmdline_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-3.1.90/library/system/test/proc_cmdline_test.rb 2014-07-29 16:02:44.000000000 +0200 @@ -0,0 +1,41 @@ +#! /usr/bin/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 set_root_path(directory) + root = File.join(DEFAULT_DATA_DIR, directory) + desc = Yast::WFM.SCROpen("chroot=#{root}:scr", false) + Yast::WFM.SCRSetDefault(desc) +end + +describe "SCR" do + describe ".proc.cmdline" do + describe "Read" do + let(:expected_list) { %w(biosdevname=1 initrd=initrd install=hd:/// splash=silent) } + let(:read_list) { Yast::SCR.Read(Yast::Path.new(".proc.cmdline")).sort } + + it "parses correctly simple files" do + set_root_path("cmdline-simple") + expect(read_list).to eq(expected_list) + end + + it "parses correctly files with two separators" do + set_root_path("cmdline-twoseparators") + expect(read_list).to eq(expected_list) + end + + it "parses correctly files with several lines" do + set_root_path("cmdline-newlines") + 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.87/package/yast2.changes new/yast2-3.1.90/package/yast2.changes --- old/yast2-3.1.87/package/yast2.changes 2014-07-25 18:57:09.000000000 +0200 +++ new/yast2-3.1.90/package/yast2.changes 2014-07-29 16:02:44.000000000 +0200 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Tue Jul 29 13:30:04 UTC 2014 - jreidinger@suse.com + +- Fix timing of slideshow - now slides goes in cycle and all have + equal time to display which improve user experience (bnc#885973) +- 3.1.90 + +------------------------------------------------------------------- +Tue Jul 29 08:09:27 UTC 2014 - ancor@suse.com + +- Fixed .proc.cmdline parsing to support more situations + (bnc#889241) +- 3.1.89 + +------------------------------------------------------------------- +Tue Jul 29 06:46:55 UTC 2014 - jreidinger@suse.com + +- fix hidding cd statistics in text only mode (bnc#864507) +- 3.1.88 + +------------------------------------------------------------------- Thu Jul 24 12:09:29 CEST 2014 - locilka@suse.com - Fixed checking for :active state of a systemd unit - it's :active diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.87/package/yast2.spec new/yast2-3.1.90/package/yast2.spec --- old/yast2-3.1.87/package/yast2.spec 2014-07-25 18:57:09.000000000 +0200 +++ new/yast2-3.1.90/package/yast2.spec 2014-07-29 16:02:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.87 +Version: 3.1.90 Release: 0 URL: https://github.com/yast/yast-yast2 @@ -94,8 +94,8 @@ Conflicts: yast2-installation < 2.18.5 Conflicts: yast2-update < 2.16.1 -# Modules 'Slides' and 'SlideShow' moved from yast2-packager to yast2 -Conflicts: yast2-packager < 2.17.12 +# Older packager use removed API +Conflicts: yast2-packager < 3.1.34 Conflicts: yast2-mouse < 2.16.0 Conflicts: autoyast2-installation < 2.16.2 # country_long.ycp and country.ycp moved to yast2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org