[yast-commit] [ci_new_pac] JFYI yast2-bootloader -> sle12

12 Feb 2014

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-bootloader -> sle12



## BNC# 853058 : "enable boot from MBR is misleading" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-bootloader/yast2-bootloader.changes	2014-01-30 15:06:00.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-bootloader/yast2-bootloader.changes	2014-02-12 13:17:43.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 12 10:18:39 UTC 2014 - jreidinger@suse.com
+
+- rephrase bootloader proposal on summary screen (BNC#853058)
+- 3.1.5
+
+-------------------------------------------------------------------
+Mon Feb 10 10:56:36 CET 2014 - snwint@suse.de
+
+- don't ask to run yast.ssh in second stage as there's no second stage
+  anymore (bnc 861537)
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-bootloader
- yast2-kdump
- yast2-product-creator
- yast2-reipl
- yast2-vm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-bootloader (Old)
 and      /mounts/work_src_done/SLE12/yast2-bootloader (BS:build ID:32526 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-bootloader", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-bootloader-3.1.4.tar.bz2

New:
----
  yast2-bootloader-3.1.5.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-bootloader.spec ++++++
--- /var/tmp/diff_new_pack.8pc5Gx/_old	2014-02-12 15:18:40.000000000 +0100
+++ /var/tmp/diff_new_pack.8pc5Gx/_new	2014-02-12 15:18:40.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-bootloader-3.1.4.tar.bz2 -> yast2-bootloader-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/package/yast2-bootloader.changes new/yast2-bootloader-3.1.5/package/yast2-bootloader.changes
--- old/yast2-bootloader-3.1.4/package/yast2-bootloader.changes	2014-01-28 11:05:41.000000000 +0100
+++ new/yast2-bootloader-3.1.5/package/yast2-bootloader.changes	2014-02-12 13:15:21.000000000 +0100
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Wed Feb 12 10:18:39 UTC 2014 - jreidinger@suse.com
+
+- rephrase bootloader proposal on summary screen (BNC#853058)
+- 3.1.5
+
+-------------------------------------------------------------------
+Mon Feb 10 10:56:36 CET 2014 - snwint@suse.de
+
+- don't ask to run yast.ssh in second stage as there's no second stage
+  anymore (bnc 861537)
+
+-------------------------------------------------------------------
 Tue Jan 28 09:56:33 UTC 2014 - jreidinger@suse.com
 
 - Fix examining MBR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/package/yast2-bootloader.spec new/yast2-bootloader-3.1.5/package/yast2-bootloader.spec
--- old/yast2-bootloader-3.1.4/package/yast2-bootloader.spec	2014-01-28 11:05:41.000000000 +0100
+++ new/yast2-bootloader-3.1.5/package/yast2-bootloader.spec	2014-02-12 13:15:21.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.4
+Version:        3.1.5
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/clients/bootloader_finish.rb new/yast2-bootloader-3.1.5/src/clients/bootloader_finish.rb
--- old/yast2-bootloader-3.1.4/src/clients/bootloader_finish.rb	2014-01-28 11:05:41.000000000 +0100
+++ new/yast2-bootloader-3.1.5/src/clients/bootloader_finish.rb	2014-02-12 13:15:21.000000000 +0100
@@ -127,53 +127,23 @@
           @ipl_msg = ""
           @ipl_msg = Ops.get_string(@finish_ret, "ipl_msg", "")
 
-          # SSH modification
-          @usessh_msg = ""
-          if Linuxrc.usessh
-            # TRANSLATORS: part of the reboot message
-            #/ %1 is replaced with a command name
-            # (message ID#SSH)
-            @usessh_msg = Builtins.sformat(
-              _("Then reconnect and run the following:\n%1\n"),
-              "yast.ssh"
-            )
-          end
-
           # TRANSLATORS: reboot message
           # %1 is replaced with additional message from reIPL
-          # %2 is replaced with additional message when using SSH
-          # See message ID#SSH
           Misc.boot_msg = Builtins.sformat(
             _(
               "\n" +
-                "Your system will now shut down.%1%2\n" +
+                "Your system will now shut down.%1\n" +
                 "For details, read the related chapter \n" +
                 "in the documentation. \n"
             ),
-            @ipl_msg,
-            @usessh_msg
+            @ipl_msg
           )
         else
-          if Linuxrc.usessh && !Linuxrc.vnc
-            # Final message after all packages from CD1 are installed
-            # and we're ready to start (boot into) the installed system
-            # Message that will be displayed along with information
-            # how the boot loader was installed
-            Misc.boot_msg = Builtins.sformat(
-              _(
-                "The system will reboot now.\n" +
-                  "After reboot, reconnect and run the following:\n" +
-                  "%1"
-              ),
-              "yast.ssh"
-            )
-          else
-            # Final message after all packages from CD1 are installed
-            # and we're ready to start (boot into) the installed system
-            # Message that will be displayed along with information
-            # how the boot loader was installed
-            Misc.boot_msg = _("The system will reboot now...")
-          end
+          # Final message after all packages from CD1 are installed
+          # and we're ready to start (boot into) the installed system
+          # Message that will be displayed along with information
+          # how the boot loader was installed
+          Misc.boot_msg = _("The system will reboot now...")
         end
 
         #--------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.5/src/modules/BootGRUB.rb
--- old/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb	2014-01-28 11:05:41.000000000 +0100
+++ new/yast2-bootloader-3.1.5/src/modules/BootGRUB.rb	2014-02-12 13:15:21.000000000 +0100
@@ -658,98 +658,48 @@
     #
     def urlLocationSummary
       Builtins.y2milestone("Prepare url summary for GRUB")
-      ret = ""
-      line = ""
       locations = []
       line = "<ul>\n<li>"
-      if Ops.get(BootCommon.globals, "boot_mbr", "") == "true"
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from MBR is enabled (<a href=\"disable_boot_mbr\">disable</a>"
-            )
-          ),
-          ")</li>\n"
+      if BootCommon.globals["boot_mbr"] == "true"
+        line << _(
+          "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
         )
       else
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from MBR is disabled (<a href=\"enable_boot_mbr\">enable</a>"
-            )
-          ),
-          ")</li>\n"
+        line << _(
+          "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
         )
       end
-      locations = Builtins.add(locations, line)
-      line = "<li>"
+      line << "</li>\n"
+      locations << line
 
-      set_boot_boot = false
-      if Ops.get(BootCommon.globals, "boot_boot", "") == "true" &&
-          BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice
-        set_boot_boot = true
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from /boot partition is enabled (<a href=\"disable_boot_boot\">disable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      elsif Ops.get(BootCommon.globals, "boot_boot", "") == "false" &&
-          BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice
-        set_boot_boot = true
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from /boot partition is disabled (<a href=\"enable_boot_boot\">enable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      end
-      if line != "<li>"
-        locations = Builtins.add(locations, line)
-        line = "<li>"
-      end
-      if Ops.get(BootCommon.globals, "boot_root", "") == "true" &&
-          !set_boot_boot
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from \"/\" partition is enabled (<a href=\"disable_boot_root\">disable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      elsif Ops.get(BootCommon.globals, "boot_root", "") == "false" &&
-          !set_boot_boot
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from \"/\" partition is disabled (<a href=\"enable_boot_root\">enable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      end
-      locations = Builtins.add(locations, line) if !set_boot_boot
+      line = "<li>"
 
-      if Ops.greater_than(Builtins.size(locations), 0)
-        # FIXME: should we translate all devices to names and add MBR suffixes?
-        ret = Builtins.sformat(
-          _("Change Location: %1"),
-          Builtins.mergestring(locations, " ")
-        )
+      # check for separated boot partition, use root otherwise
+      if BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice
+        if BootCommon.globals["boot_boot"] == "true"
+          line << _(
+            "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
+          )
+        else
+          line << _(
+            "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
+          )
+        end
+      else
+        if BootCommon.globals["boot_root"] == "true"
+          line << _(
+            "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
+          )
+        else
+          line << _(
+            "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">do not install</a>"
+          )
+        end
       end
+      line << "</li></ul>"
+      locations << line
 
-      ret
+      return _("Change Location: %s") % locations.join(" ")
     end
 
     # Display bootloader summary
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.5/src/modules/BootGRUB2.rb
--- old/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb	2014-01-28 11:05:41.000000000 +0100
+++ new/yast2-bootloader-3.1.5/src/modules/BootGRUB2.rb	2014-02-12 13:15:21.000000000 +0100
@@ -228,99 +228,50 @@
     #
     #
     def urlLocationSummary
-      Builtins.y2milestone("Prepare url summary for GRUB")
-      ret = ""
-      line = ""
+      Builtins.y2milestone("Prepare url summary for GRUB2")
+      # FIXME identical code in BootGRUB module
       locations = []
       line = "<ul>\n<li>"
-      if Ops.get(BootCommon.globals, "boot_mbr", "") == "true"
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from MBR is enabled (<a href=\"disable_boot_mbr\">disable</a>"
-            )
-          ),
-          ")</li>\n"
+      if BootCommon.globals["boot_mbr"] == "true"
+        line << _(
+          "Install bootcode into MBR (<a href=\"disable_boot_mbr\">do not install</a>)"
         )
       else
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from MBR is disabled (<a href=\"enable_boot_mbr\">enable</a>"
-            )
-          ),
-          ")</li>\n"
+        line << _(
+          "Do not install bootcode into MBR (<a href=\"enable_boot_mbr\">install</a>)"
         )
       end
-      locations = Builtins.add(locations, line)
-      line = "<li>"
+      line << "</li>\n"
+      locations << line
 
-      set_boot_boot = false
-      if Ops.get(BootCommon.globals, "boot_boot", "") == "true" &&
-          BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice
-        set_boot_boot = true
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from /boot partition is enabled (<a href=\"disable_boot_boot\">disable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      elsif Ops.get(BootCommon.globals, "boot_boot", "") == "false" &&
-          BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice
-        set_boot_boot = true
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from /boot partition is disabled (<a href=\"enable_boot_boot\">enable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      end
-      if line != "<li>"
-        locations = Builtins.add(locations, line)
-        line = "<li>"
-      end
-      if Ops.get(BootCommon.globals, "boot_root", "") == "true" &&
-          !set_boot_boot
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from \"/\" partition is enabled (<a href=\"disable_boot_root\">disable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      elsif Ops.get(BootCommon.globals, "boot_root", "") == "false" &&
-          !set_boot_boot
-        line = Ops.add(
-          Ops.add(
-            line,
-            _(
-              "Boot from \"/\" partition is disabled (<a href=\"enable_boot_root\">enable</a>"
-            )
-          ),
-          ")</li></ul>"
-        )
-      end
-      locations = Builtins.add(locations, line) if !set_boot_boot
+      line = "<li>"
 
-      if Ops.greater_than(Builtins.size(locations), 0)
-        # FIXME: should we translate all devices to names and add MBR suffixes?
-        ret = Builtins.sformat(
-          _("Change Location: %1"),
-          Builtins.mergestring(locations, " ")
-        )
+      # check for separated boot partition, use root otherwise
+      if BootStorage.BootPartitionDevice != BootStorage.RootPartitionDevice
+        if BootCommon.globals["boot_boot"] == "true"
+          line << _(
+            "Install bootcode into /boot partition (<a href=\"disable_boot_boot\">do not install</a>)"
+          )
+        else
+          line << _(
+            "Do not install bootcode into /boot partition (<a href=\"enable_boot_boot\">install</a>)"
+          )
+        end
+      else
+        if BootCommon.globals["boot_root"] == "true"
+          line << _(
+            "Install bootcode into \"/\" partition (<a href=\"disable_boot_root\">do not install</a>)"
+          )
+        else
+          line << _(
+            "Do not install bootcode into \"/\" partition (<a href=\"enable_boot_root\">do not install</a>"
+          )
+        end
       end
+      line << "</li></ul>"
+      locations << line
 
-      ret
+      return _("Change Location: %s") % locations.join(" ")
     end
 
 

continue with "q"...


Checked in at Wed Feb 12 15:18:54 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)