Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2014-07-30 07:34:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2014-07-28 06:31:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2014-07-30 07:35:03.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Jul 29 15:52:43 UTC 2014 - lslezak@suse.cz + +- ag_zypp_repos - do not try parsing directory entries in + /etc/zypp/repos.d/, that leads to invalid values (bnc#867911) +- 3.1.35 + +------------------------------------------------------------------- +Tue Jul 29 13:22:35 UTC 2014 - jreidinger@suse.com + +- remove slide show display time recalculation to improve slide + show user experience (bnc#885973) +- 3.1.34 + +------------------------------------------------------------------- +Mon Jul 28 13:10:51 UTC 2014 - ancor@suse.com + +- fixed reading of /proc/cmdline containing newline (bnc#887844) +- 3.1.33 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.32.tar.bz2 New: ---- yast2-packager-3.1.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.EorulZ/_old 2014-07-30 07:35:04.000000000 +0200 +++ /var/tmp/diff_new_pack.EorulZ/_new 2014-07-30 07:35:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.32 +Version: 3.1.35 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-packager-3.1.32.tar.bz2 -> yast2-packager-3.1.35.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.32/package/yast2-packager.changes new/yast2-packager-3.1.35/package/yast2-packager.changes --- old/yast2-packager-3.1.32/package/yast2-packager.changes 2014-07-25 16:44:12.000000000 +0200 +++ new/yast2-packager-3.1.35/package/yast2-packager.changes 2014-07-29 18:09:45.000000000 +0200 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Tue Jul 29 15:52:43 UTC 2014 - lslezak@suse.cz + +- ag_zypp_repos - do not try parsing directory entries in + /etc/zypp/repos.d/, that leads to invalid values (bnc#867911) +- 3.1.35 + +------------------------------------------------------------------- +Tue Jul 29 13:22:35 UTC 2014 - jreidinger@suse.com + +- remove slide show display time recalculation to improve slide + show user experience (bnc#885973) +- 3.1.34 + +------------------------------------------------------------------- +Mon Jul 28 13:10:51 UTC 2014 - ancor@suse.com + +- fixed reading of /proc/cmdline containing newline (bnc#887844) +- 3.1.33 + +------------------------------------------------------------------- Fri Jul 25 14:35:30 UTC 2014 - ancor@suse.com - adjust width of drive selection dialog (bnc#882657) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.32/package/yast2-packager.spec new/yast2-packager-3.1.35/package/yast2-packager.spec --- old/yast2-packager-3.1.32/package/yast2-packager.spec 2014-07-25 16:44:12.000000000 +0200 +++ new/yast2-packager-3.1.35/package/yast2-packager.spec 2014-07-29 18:09:45.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.32 +Version: 3.1.35 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.32/src/modules/PackageSlideShow.rb new/yast2-packager-3.1.35/src/modules/PackageSlideShow.rb --- old/yast2-packager-3.1.32/src/modules/PackageSlideShow.rb 2014-07-25 16:44:12.000000000 +0200 +++ new/yast2-packager-3.1.35/src/modules/PackageSlideShow.rb 2014-07-29 18:09:45.000000000 +0200 @@ -708,71 +708,6 @@ log.debug "Recalculated remaining time: #{@remaining_times_per_cd_per_src}" end - - # Recalculate slide interval - - if Slides.HaveSlides - slides_remaining = Slides.slides.size - SlideShow.current_slide_no - 1 - - if slides_remaining > 0 - # The remaining time for the rest of the slides depends on the - # remaining time for the current CD only: This is where the - # slide images and texts reside. Normally, only CD1 has slides - # at all, i.e. the slide show must be finished when CD1 is - # done. - # - # In addition to that, take elapsed time for current slide - # into account so all slides get about the same time. - - time_remaining = Ops.subtract( - Ops.add( - Ops.get( - @remaining_times_per_cd_per_src, - [ - Ops.subtract(@current_src_no, 1), - Ops.subtract(@current_cd_no, 1) - ], - 1 - ), - ::Time.now.to_i - ), - SlideShow.slide_start_time - ) - SlideShow.slide_interval = Ops.divide( - time_remaining, - slides_remaining - ) - Builtins.y2debug( - "New slide interval: %1 - slides remaining: %2 - remaining time: %3", - SlideShow.slide_interval, - slides_remaining, - time_remaining - ) - - if Ops.less_than( - SlideShow.slide_interval, - SlideShow.slide_min_interval - ) - SlideShow.slide_interval = SlideShow.slide_min_interval - Builtins.y2debug( - "Resetting slide interval to min slide interval: %1", - SlideShow.slide_interval - ) - end - - if Ops.greater_than( - SlideShow.slide_interval, - SlideShow.slide_max_interval - ) - SlideShow.slide_interval = SlideShow.slide_max_interval - Builtins.y2debug( - "Resetting slide interval to max slide interval: %1", - SlideShow.slide_interval - ) - end - end - end - SlideShow.next_recalc_time = ::Time.now.to_i + SlideShow.recalc_interval true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.32/src/modules/Packages.rb new/yast2-packager-3.1.35/src/modules/Packages.rb --- old/yast2-packager-3.1.32/src/modules/Packages.rb 2014-07-25 16:44:12.000000000 +0200 +++ new/yast2-packager-3.1.35/src/modules/Packages.rb 2014-07-29 18:09:45.000000000 +0200 @@ -974,7 +974,7 @@ SCR.Read(path(".target.string"), "/proc/cmdline") ) - options = Builtins.splitstring(cmdline, " \t") + options = cmdline.split(/\s/) if Builtins.contains(options, "biosdevname=1") Builtins.y2milestone("Biosdevname explicitly enabled") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.32/src/servers_non_y2/ag_zypp_repos new/yast2-packager-3.1.35/src/servers_non_y2/ag_zypp_repos --- old/yast2-packager-3.1.32/src/servers_non_y2/ag_zypp_repos 2014-07-25 16:44:12.000000000 +0200 +++ new/yast2-packager-3.1.35/src/servers_non_y2/ag_zypp_repos 2014-07-29 18:09:45.000000000 +0200 @@ -38,6 +38,12 @@ my $this_entry = {}; $file = $dir.'/'.$file; + + if (-d $file) { + y2warning($file." is a directory, skipping"); + next; + } + y2milestone ("Parsing file: ".$file); open (FILE, $file) || do { y2error ("Cannot open file ".$file.": ".$!); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.32/test/packages_test.rb new/yast2-packager-3.1.35/test/packages_test.rb --- old/yast2-packager-3.1.32/test/packages_test.rb 2014-07-25 16:44:12.000000000 +0200 +++ new/yast2-packager-3.1.35/test/packages_test.rb 2014-07-29 18:09:45.000000000 +0200 @@ -50,6 +50,13 @@ expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true end + it "returns biosdevname within the list of required packages with new line at the end" do + Yast::SCR.stub(:Read).with( + SCR_STRING_PATH,"/proc/cmdline" + ).and_return("install=cd:// vga=0x314\nbiosdevname=1\n") + expect(Yast::Packages.kernelCmdLinePackages.include?("biosdevname")).to be_true + end + it "does not return biosdevname within the list of required packages" do Yast::SCR.stub(:Read).with( SCR_STRING_PATH,"/proc/cmdline" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org