Hello community,
here is the log from the commit of package rubygem-cfa_grub2 for
openSUSE:Factory checked in at 2017-12-01 17:17:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-cfa_grub2 (Old)
and /work/SRC/openSUSE:Factory/.rubygem-cfa_grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-cfa_grub2"
Fri Dec 1 17:17:44 2017 rev:10 rq:546774 version:0.6.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-cfa_grub2/rubygem-cfa_grub2.changes
2017-08-04 11:57:20.884836073 +0200
+++ /work/SRC/openSUSE:Factory/.rubygem-cfa_grub2.new/rubygem-cfa_grub2.changes
2017-12-01 17:17:45.470506592 +0100
@@ -0,0 +1,12 @@
+-------------------------------------------------------------------------
+Thu Nov 30 14:35:47 UTC 2017 - jreidin...@suse.com
+
+- fix reading GRUB_TERMINAL (caused by fix for bsc#1068578)
+- 0.6.5
+
+-------------------------------------------------------------
+Thu Nov 30 07:45:45 UTC 2017 - jreidin...@suse.com
+
+- avoid crash if config file uses trailing comment (bsc#1068578)
+- 0.6.4
+
Old:
----
cfa_grub2-0.6.3.gem
New:
----
cfa_grub2-0.6.5.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-cfa_grub2.spec ++++++
--- /var/tmp/diff_new_pack.4rbh1Q/_old 2017-12-01 17:17:46.206480133 +0100
+++ /var/tmp/diff_new_pack.4rbh1Q/_new 2017-12-01 17:17:46.206480133 +0100
@@ -17,7 +17,7 @@
Name: rubygem-cfa_grub2
-Version: 0.6.3
+Version: 0.6.5
Release: 0
%define mod_name cfa_grub2
%define mod_full_name %{mod_name}-%{version}
++++++ cfa_grub2-0.6.3.gem -> cfa_grub2-0.6.5.gem ++++++
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/cfa/grub2/default.rb new/lib/cfa/grub2/default.rb
--- old/lib/cfa/grub2/default.rb 2017-08-02 13:53:52.000000000 +0200
+++ new/lib/cfa/grub2/default.rb 2017-11-30 16:11:42.000000000 +0100
@@ -49,7 +49,7 @@
kernels = [kernel_params, xen_hypervisor_params, xen_kernel_params,
recovery_params]
kernels.each do |kernel|
- param_line = data[kernel.key]
+ param_line = value_for(kernel.key)
kernel.replace(param_line) if param_line
end
end
@@ -64,27 +64,28 @@
def kernel_params
@kernel_params ||= KernelParams.new(
- data["GRUB_CMDLINE_LINUX_DEFAULT"], "GRUB_CMDLINE_LINUX_DEFAULT"
+ value_for("GRUB_CMDLINE_LINUX_DEFAULT"), "GRUB_CMDLINE_LINUX_DEFAULT"
)
end
def xen_hypervisor_params
@xen_hypervisor_params ||= KernelParams.new(
- data["GRUB_CMDLINE_XEN_DEFAULT"],
+ value_for("GRUB_CMDLINE_XEN_DEFAULT"),
"GRUB_CMDLINE_XEN_DEFAULT"
)
end
def xen_kernel_params
@xen_kernel_params ||= KernelParams.new(
- data["GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"],
+ value_for("GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"),
"GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT"
)
end
def recovery_params
@recovery_params ||= KernelParams.new(
- data["GRUB_CMDLINE_LINUX_RECOVERY"], "GRUB_CMDLINE_LINUX_RECOVERY"
+ value_for("GRUB_CMDLINE_LINUX_RECOVERY"),
+ "GRUB_CMDLINE_LINUX_RECOVERY"
)
end
@@ -102,13 +103,14 @@
end
def terminal
- case data["GRUB_TERMINAL"]
+ value = value_for("GRUB_TERMINAL")
+ case value
when "", nil then nil
when "console" then :console
when "serial" then :serial
when "gfxterm" then :gfxterm
else
- raise "unknown GRUB_TERMINAL option #{data["GRUB_TERMINAL"].inspect}"
+ raise "unknown GRUB_TERMINAL option #{value.inspect}"
end
end
@@ -127,7 +129,13 @@
end
def serial_console
- data["GRUB_SERIAL_COMMAND"]
+ value_for("GRUB_SERIAL_COMMAND")
+ end
+
+ private
+
+ def value_for(key)
+ data[key].respond_to?(:value) ? data[key].value : data[key]
end
# Represents kernel append line with helpers to easier modification.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-08-02 13:53:57.000000000 +0200
+++ new/metadata 2017-11-30 16:11:47.000000000 +0100
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: cfa_grub2
version: !ruby/object:Gem::Version
- version: 0.6.3
+ version: 0.6.5
platform: ruby
authors:
- Josef Reidinger
autorequire:
bindir: bin
cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: cfa
@@ -56,7 +56,7 @@
version: 1.3.6
requirements: []
rubyforge_project:
-rubygems_version: 2.4.5.2
+rubygems_version: 2.6.11
signing_key:
specification_version: 4
summary: Models for GRUB2 configuration files.
