Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2017-02-04 15:16:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2017-01-15 11:02:30.302747460 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2017-02-04 16:52:24.598274559 +0100 @@ -1,0 +2,6 @@ +Wed Jan 25 12:57:38 UTC 2017 - [email protected] + +- Implement simple_mode -> label_proposal (FATE#322328) +- 3.2.15 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.2.14.tar.bz2 New: ---- yast2-bootloader-3.2.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.gcUgxI/_old 2017-02-04 16:52:24.922228435 +0100 +++ /var/tmp/diff_new_pack.gcUgxI/_new 2017-02-04 16:52:24.926227866 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.2.14 +Version: 3.2.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.2.14.tar.bz2 -> yast2-bootloader-3.2.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/.travis.yml new/yast2-bootloader-3.2.15/.travis.yml --- old/yast2-bootloader-3.2.14/.travis.yml 2017-01-10 15:14:53.602343000 +0100 +++ new/yast2-bootloader-3.2.15/.travis.yml 2017-01-30 16:16:35.803538944 +0100 @@ -1,11 +1,11 @@ sudo: required -language: ruby +language: bash services: - docker before_install: - docker build -t yast-bootloader-image . script: - # the "yast-travis" script is included in the base yastdevel/ruby-tw image - # see https://github.com/yast/docker-yast-ruby-tw/blob/master/yast-travis - - docker run -it -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-bootloader-image yast-travis + # the "yast-travis-ruby" script is included in the base yastdevel/ruby image + # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby + - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-bootloader-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/Dockerfile new/yast2-bootloader-3.2.15/Dockerfile --- old/yast2-bootloader-3.2.14/Dockerfile 2017-01-10 15:14:53.602343000 +0100 +++ new/yast2-bootloader-3.2.15/Dockerfile 2017-01-30 16:16:35.891538944 +0100 @@ -1,3 +1,3 @@ -FROM yastdevel/ruby-tw -COPY . /tmp/sources +FROM yastdevel/ruby +COPY . /usr/src/app diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/package/yast2-bootloader.changes new/yast2-bootloader-3.2.15/package/yast2-bootloader.changes --- old/yast2-bootloader-3.2.14/package/yast2-bootloader.changes 2017-01-10 15:14:53.606343000 +0100 +++ new/yast2-bootloader-3.2.15/package/yast2-bootloader.changes 2017-01-30 16:16:35.911538944 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 25 12:57:38 UTC 2017 - [email protected] + +- Implement simple_mode -> label_proposal (FATE#322328) +- 3.2.15 + +------------------------------------------------------------------- Fri Jan 6 13:22:36 UTC 2017 - [email protected] - do not crash when switching from no bootloader to grub2 when diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/package/yast2-bootloader.spec new/yast2-bootloader-3.2.15/package/yast2-bootloader.spec --- old/yast2-bootloader-3.2.14/package/yast2-bootloader.spec 2017-01-10 15:14:53.606343000 +0100 +++ new/yast2-bootloader-3.2.15/package/yast2-bootloader.spec 2017-01-30 16:16:35.911538944 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.2.14 +Version: 3.2.15 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/src/lib/bootloader/grub2.rb new/yast2-bootloader-3.2.15/src/lib/bootloader/grub2.rb --- old/yast2-bootloader-3.2.14/src/lib/bootloader/grub2.rb 2017-01-10 15:14:53.610343000 +0100 +++ new/yast2-bootloader-3.2.15/src/lib/bootloader/grub2.rb 2017-01-30 16:16:36.055538944 +0100 @@ -100,7 +100,7 @@ # Display bootloader summary # @return a list of summary lines - def summary + def summary(simple_mode: false) result = [ Yast::Builtins.sformat( _("Boot Loader Type: %1"), @@ -123,10 +123,11 @@ # other mode than autoyast on running system # both ppc and s390 have special devices for stage1 so it do not make sense # allow change of location to MBR or boot partition (bnc#879107) - result << url_location_summary if !Yast::Arch.ppc && !Yast::Arch.s390 && !Yast::Mode.config + no_location = simple_mode || Yast::Arch.ppc || Yast::Arch.s390 || Yast::Mode.config + result << url_location_summary unless no_location order_sum = disk_order_summary - result << order_sum if order_sum + result << order_sum unless order_sum.empty? result end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/src/lib/bootloader/grub2efi.rb new/yast2-bootloader-3.2.15/src/lib/bootloader/grub2efi.rb --- old/yast2-bootloader-3.2.14/src/lib/bootloader/grub2efi.rb 2017-01-10 15:14:53.610343000 +0100 +++ new/yast2-bootloader-3.2.15/src/lib/bootloader/grub2efi.rb 2017-01-30 16:16:36.071538944 +0100 @@ -70,8 +70,7 @@ # Display bootloader summary # @return a list of summary lines - - def summary + def summary(*) [ Yast::Builtins.sformat( _("Boot Loader Type: %1"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/src/lib/bootloader/none_bootloader.rb new/yast2-bootloader-3.2.15/src/lib/bootloader/none_bootloader.rb --- old/yast2-bootloader-3.2.14/src/lib/bootloader/none_bootloader.rb 2017-01-10 15:14:53.610343000 +0100 +++ new/yast2-bootloader-3.2.15/src/lib/bootloader/none_bootloader.rb 2017-01-30 16:16:36.107538944 +0100 @@ -8,13 +8,17 @@ # Represents when bootloader want user manage itself class NoneBootloader < BootloaderBase include Yast::I18n - def summary + def summary(simple_mode: false) textdomain "bootloader" - [Yast::HTML.Colorize( - _("Do not install any boot loader"), - "red" - )] + if simple_mode + [_("Do not install any boot loader")] + else + [Yast::HTML.Colorize( + _("Do not install any boot loader"), + "red" + )] + end end def name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/src/lib/bootloader/proposal_client.rb new/yast2-bootloader-3.2.15/src/lib/bootloader/proposal_client.rb --- old/yast2-bootloader-3.2.14/src/lib/bootloader/proposal_client.rb 2017-01-10 15:14:53.614343000 +0100 +++ new/yast2-bootloader-3.2.15/src/lib/bootloader/proposal_client.rb 2017-01-30 16:16:36.107538944 +0100 @@ -153,6 +153,7 @@ ret["links"] = PROPOSAL_LINKS # use always possible links even if it maybe not used ret["raw_proposal"] = Yast::Bootloader.Summary + ret["label_proposal"] = Yast::Bootloader.Summary(simple_mode: true) # F#300779 - Install diskless client (NFS-root) # kokso: bootloader will not be installed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.2.14/src/modules/Bootloader.rb new/yast2-bootloader-3.2.15/src/modules/Bootloader.rb --- old/yast2-bootloader-3.2.14/src/modules/Bootloader.rb 2017-01-10 15:14:53.614343000 +0100 +++ new/yast2-bootloader-3.2.15/src/modules/Bootloader.rb 2017-01-30 16:16:36.191538944 +0100 @@ -215,14 +215,14 @@ # Display bootloader summary # @return a list of summary lines - def Summary + def Summary(simple_mode: false) # kokso: additional warning that root partition is nfs type -> bootloader will not be installed if BootStorage.disk_with_boot_partition == "/dev/nfs" log.info "Bootloader::Summary() -> Boot partition is nfs type, bootloader will not be installed." return _("The boot partition is of type NFS. Bootloader cannot be installed.") end - ::Bootloader::BootloaderFactory.current.summary + ::Bootloader::BootloaderFactory.current.summary(simple_mode: simple_mode) end # Update the whole configuration
