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

25 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-installation -> sle12



## BNC# 861465 : "searching for system files: undefined method: 'downcase' for nil: NilClass" (RESOLVED/FIXED)
## BNC# 865371 : ""Confirm Installation" headline - white on light blue?" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes	2014-02-24 15:01:34.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes	2014-02-25 15:32:39.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Feb 25 14:14:59 CET 2014 - locilka@suse.com
+
+- Adapted ignored_features to handle possibly missing Cmdline entry
+  from Linuxrc (bnc#861465)
+- 3.1.42
+
+-------------------------------------------------------------------
+Tue Feb 25 13:27:34 CET 2014 - locilka@suse.cz
+
+- Removed hard-coded color and RichText formatting from
+  installation confirmation dialog (#bnc#865371)
+- 3.1.41
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-installation
- at least 18 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old)
 and      /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:33400 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

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


Old:
----
  yast2-installation-3.1.40.tar.bz2

New:
----
  yast2-installation-3.1.42.tar.bz2

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.CZIGDE/_old	2014-02-25 16:52:15.000000000 +0100
+++ /var/tmp/diff_new_pack.CZIGDE/_new	2014-02-25 16:52:15.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.40
+Version:        3.1.42
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-installation-3.1.40.tar.bz2 -> yast2-installation-3.1.42.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.40/package/yast2-installation.changes new/yast2-installation-3.1.42/package/yast2-installation.changes
--- old/yast2-installation-3.1.40/package/yast2-installation.changes	2014-02-21 15:15:02.000000000 +0100
+++ new/yast2-installation-3.1.42/package/yast2-installation.changes	2014-02-25 15:29:55.000000000 +0100
@@ -1,4 +1,18 @@
 -------------------------------------------------------------------
+Tue Feb 25 14:14:59 CET 2014 - locilka@suse.com
+
+- Adapted ignored_features to handle possibly missing Cmdline entry
+  from Linuxrc (bnc#861465)
+- 3.1.42
+
+-------------------------------------------------------------------
+Tue Feb 25 13:27:34 CET 2014 - locilka@suse.cz
+
+- Removed hard-coded color and RichText formatting from
+  installation confirmation dialog (#bnc#865371)
+- 3.1.41
+
+-------------------------------------------------------------------
 Fri Feb 21 14:54:01 CET 2014 - snwint@suse.de
 
 - Make vnc use real yast theme (bnc #855246) and make vnc screen size configurable.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.40/package/yast2-installation.spec new/yast2-installation-3.1.42/package/yast2-installation.spec
--- old/yast2-installation-3.1.40/package/yast2-installation.spec	2014-02-21 15:15:02.000000000 +0100
+++ new/yast2-installation-3.1.42/package/yast2-installation.spec	2014-02-25 15:29:55.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.40
+Version:        3.1.42
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.40/src/include/installation/misc.rb new/yast2-installation-3.1.42/src/include/installation/misc.rb
--- old/yast2-installation-3.1.40/src/include/installation/misc.rb	2014-02-21 15:15:02.000000000 +0100
+++ new/yast2-installation-3.1.42/src/include/installation/misc.rb	2014-02-25 15:29:55.000000000 +0100
@@ -239,7 +239,7 @@
         confirm_button_label = Label.InstallButton
       else
         # Heading for confirmation popup before the update really starts
-        heading = "<h3>" + _("Confirm Update") + "</h3>"
+        heading = HTML.Heading(_("Confirm Update"))
 
         body =
           # Text for confirmation popup before the update really starts 1/3
@@ -258,18 +258,7 @@
         confirm_button_label = _("Start &Update")
       end
 
-      heading_bg_color = "#A9CEDD"
-
       display_info = UI.GetDisplayInfo
-      text = Ops.get_boolean(display_info, "RichTextSupportsTable", false) ?
-        Builtins.sformat(
-          "<table bgcolor=\"%1\"><tr><td>%2</td></tr></table>%3",
-          heading_bg_color,
-          heading,
-          body
-        ) :
-        Ops.add(heading, body)
-
       size_x = Builtins.tointeger(Ops.get_integer(display_info, "Width", 800))
       size_y = Builtins.tointeger(Ops.get_integer(display_info, "Height", 600))
 
@@ -290,7 +279,7 @@
           HBox(
             HSpacing(0.7),
             VSpacing(size_y), # force height
-            RichText(text),
+            RichText(heading + body),
             HSpacing(0.7)
           ),
           ButtonBox(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.40/src/modules/InstFunctions.rb new/yast2-installation-3.1.42/src/modules/InstFunctions.rb
--- old/yast2-installation-3.1.40/src/modules/InstFunctions.rb	2014-02-21 15:15:02.000000000 +0100
+++ new/yast2-installation-3.1.42/src/modules/InstFunctions.rb	2014-02-25 15:29:55.000000000 +0100
@@ -60,8 +60,8 @@
         polish(Linuxrc.InstallInf(key))
       end
 
-      # Features mentioned in 'Cmdline' entry
-      cmdline = polish(Linuxrc.InstallInf("Cmdline")).split
+      # Features mentioned in 'Cmdline' entry, it might not be defined (bnc#861465)
+      cmdline = polish(Linuxrc.InstallInf("Cmdline") || "").split
       cmdline_features = cmdline.select do |cmd|
         cmd =~ /^ignored?features?=/i
       end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.40/test/inst_functions.rb new/yast2-installation-3.1.42/test/inst_functions.rb
--- old/yast2-installation-3.1.40/test/inst_functions.rb	2014-02-21 15:15:02.000000000 +0100
+++ new/yast2-installation-3.1.42/test/inst_functions.rb	2014-02-25 15:29:55.000000000 +0100
@@ -9,6 +9,14 @@
 # For mocking
 Yast.import "Linuxrc"
 
+def stub_install_inf(install_inf)
+  Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
+
+  install_inf.keys.each do |key|
+    Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
+  end
+end
+
 describe "when getting list of ignored features from Linuxrc" do
   before(:each) do
     Yast::InstFunctions.reset_ignored_features
@@ -81,13 +89,20 @@
       'Cmdline' => 'splash=silent vga=0x314',
       'Keyboard' => '1',
     }
-    Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
-    install_inf.keys.each do |key|
-      Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
-    end
+    stub_install_inf(install_inf)
 
     expect(Yast::InstFunctions.ignored_features.sort).to eq(['f1','f2','f3','f4','f5','f6','f7'])
   end
+
+  it "handles missing Cmdline in Linuxrc" do
+    install_inf = {
+      # Cmdline is not defined, bnc#861465
+      'Cmdline' => nil,
+    }
+    stub_install_inf(install_inf)
+
+    expect(Yast::InstFunctions.ignored_features.sort).to be_empty
+  end
 end
 
 describe "#feature_ignored?" do
@@ -147,10 +162,7 @@
       'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8',
       'Keyboard' => '1',
     }
-    Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
-    install_inf.keys.each do |key|
-      Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
-    end
+    stub_install_inf(install_inf)
 
     ['f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8'].each do |key|
       expect(Yast::InstFunctions.feature_ignored?(key)).to be_true, "Key #{key} is not ignored"
@@ -167,10 +179,7 @@
       'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8',
       'Keyboard' => '1',
     }
-    Yast::Linuxrc.stub(:keys).and_return(install_inf.keys)
-    install_inf.keys.each do |key|
-      Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key])
-    end
+    stub_install_inf(install_inf)
 
     expect(Yast::InstFunctions.feature_ignored?('f9')).to be_false
   end

continue with "q"...


Checked in at Tue Feb 25 16:52:35 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)