Mailinglist Archive: yast-commit (1088 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2 -> sle12
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 -> sle12



## BNC# 879428 : "Internal Error Kernel.rb:696:" (RESOLVED/FIXED)
## BNC# 879399 : "YaST System Log looks at wrong file" (RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-05-19
17:00:58.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-05-23
13:28:07.000000000 +0200
@@ -1,0 +2,14 @@
+Fri May 23 12:35:42 CEST 2014 - locilka@xxxxxxxx
+
+- Added check for existence of /etc/modules.d/ directory in Kernel
+ library, the directory is created when missing (bnc#879428)
+- 3.1.67
+
+-------------------------------------------------------------------
+Fri May 23 09:06:28 UTC 2014 - mfilka@xxxxxxxx
+
+- bnc#879399
+ - offer /var/log/boot.log in SysLog module for view
+- 3.1.66
+
+-------------------------------------------------------------------

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

Package is "yast2", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-3.1.65.tar.bz2

New:
----
yast2-3.1.67.tar.bz2

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

Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.244cFJ/_old 2014-05-23 16:12:20.000000000 +0200
+++ /var/tmp/diff_new_pack.244cFJ/_new 2014-05-23 16:12:20.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2
-Version: 3.1.65
+Version: 3.1.67
Release: 0
URL: https://github.com/yast/yast-yast2


++++++ yast2-3.1.65.tar.bz2 -> yast2-3.1.67.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-3.1.65/library/packages/src/modules/SlideShow.rb
new/yast2-3.1.67/library/packages/src/modules/SlideShow.rb
--- old/yast2-3.1.65/library/packages/src/modules/SlideShow.rb 2014-05-19
16:00:35.000000000 +0200
+++ new/yast2-3.1.67/library/packages/src/modules/SlideShow.rb 2014-05-23
13:20:21.000000000 +0200
@@ -109,6 +109,13 @@

module Yast
class SlideShowClass < Module
+ include Yast::Logger
+
+ module UI_ID
+ TOTAL_PROGRESS = :progressTotal
+ CURRENT_PACKAGE = :progressCurrentPackage
+ end
+
def main
Yast.import "UI"

@@ -142,6 +149,7 @@
@user_abort = false

# we need to remember the values for tab switching
+ # these are the initial values
@total_progress_label = _("Installing...")
@sub_progress_label = _("Installing...")
@total_progress_value = 0
@@ -245,66 +253,67 @@
end

# Restart the subprogress of the slideshow. This means the
- # label will be set to \param text, value to 0.
+ # label will be set to given text, value to 0.
# @param [String] text new label for the subprogress
def SubProgressStart(text)
- if UI.WidgetExists(:progressCurrentPackage)
- UI.ChangeWidget(:progressCurrentPackage, :Value, 0)
- UI.ChangeWidget(:progressCurrentPackage, :Label, text)
- end
-
- @sub_progress_label = text
-
- nil
+ SubProgress(0, text)
end

- # Update status of subprogress of the slideshow. The new value will be set
- # to \param value, if the \text is not nil, the label will be updated
- # to this text as well. Otherwise label will not change.
+ # Updates status of the sub-progress in slide show. The new value and label
+ # will be set to values given as parametes. If a given parameter contains
*nil*,
+ # respective value/label will not be updated.
+ #
# @param [Fixnum] value new value for the subprogress
- # @param [String] text new label for the subprogress
- def SubProgress(value, text)
- if UI.WidgetExists(:progressCurrentPackage)
- UI.ChangeWidget(:progressCurrentPackage, :Value, value)
- UI.ChangeWidget(:progressCurrentPackage, :Label, text) if text != nil
- end
+ # @param [String] label new label for the subprogress
+ def SubProgress(value, label)
+ value ||= @sub_progress_value
+ label ||= @sub_progress_label
+
+ if UI.WidgetExists(UI_ID::CURRENT_PACKAGE)
+ if @sub_progress_value != value
+ @sub_progress_value = value
+ UI.ChangeWidget(UI_ID::CURRENT_PACKAGE, :Value, value)
+ end

- @sub_progress_value = value
- @sub_progress_label = text if text != nil
+ if @sub_progress_label != label
+ @sub_progress_label = label
+ UI.ChangeWidget(UI_ID::CURRENT_PACKAGE, :Label, label)
+ end
+ end

nil
end

# Restart the global progress of the slideshow. This means the
- # label will be set to \param text, value to 0.
+ # label will be set to given text, value to 0.
+ #
# @param [String] text new label for the global progress
def GlobalProgressStart(text)
- @total_progress_label = text
- if UI.WidgetExists(:progressTotal)
- UI.ChangeWidget(:progressTotal, :Value, 0)
- UI.ChangeWidget(:progressTotal, :Label, text)
- end
-
- @total_progress_label = text
- @total_progress_value = 0
-
- nil
+ UpdateGlobalProgress(0, text)
end

- # Update status of global progress of the slideshow. The new value will be
set
- # to \param value, if the \text is not nil, the label will be updated
- # to this text as well. Otherwise label will not change.
+ # Updates status of the global progress in slide show. The new value and
label
+ # will be set to values given as parametes. If a given parameter contains
*nil*,
+ # respective value/label will not be updated.
+ #
# @param [Fixnum] value new value for the global progress
- # @param text new label for the global progress
- def UpdateGlobalProgress(value, new_text)
- @total_progress_label = new_text if new_text != nil
- @total_progress_value = value
-
- if UI.WidgetExists(:progressTotal)
- UI.ChangeWidget(:progressTotal, :Value, value)
- UI.ChangeWidget(:progressTotal, :Label, new_text) if new_text != nil
+ # @param [String] label new label for the global progress
+ def UpdateGlobalProgress(value, label)
+ value ||= @total_progress_value
+ label ||= @total_progress_label
+
+ if UI.WidgetExists(UI_ID::TOTAL_PROGRESS)
+ if @total_progress_value != value
+ @total_progress_value = value
+ UI.ChangeWidget(UI_ID::TOTAL_PROGRESS, :Value, value)
+ end
+
+ if @total_progress_label != label
+ @total_progress_label = label
+ UI.ChangeWidget(UI_ID::TOTAL_PROGRESS, :Label, label)
+ end
else
- Builtins.y2milestone("progressTotal widget missing")
+ log.warn "progressTotal widget missing"
end

# update slide
@@ -371,13 +380,11 @@
nil
end

- # Return the current global progress label.
- # @return [String] current label
+ # Sets the current global progress label.
+ #
+ # @param [String] new label
def SetGlobalProgressLabel(text)
- @total_progress_label = text
- if UI.WidgetExists(:progressTotal)
- UI.ChangeWidget(:progressTotal, :Label, text)
- end
+ UpdateGlobalProgress(nil, text)

nil
end
@@ -385,13 +392,12 @@
# Append message to the installation log.
# @param [String] msg message to be added, without trailing eoln
def AppendMessageToInstLog(msg)
- log_line = Ops.add(msg, "\n")
- @inst_log = Ops.add(@inst_log, log_line)
+ log_line = "#{msg}\n"

- if ShowingDetails()
- if UI.WidgetExists(:instLog)
- UI.ChangeWidget(:instLog, :LastLine, log_line)
- end
+ @inst_log << log_line
+
+ if ShowingDetails() && UI.WidgetExists(:instLog)
+ UI.ChangeWidget(:instLog, :LastLine, log_line)
end

nil
@@ -508,7 +514,7 @@
# too much flicker upon update (UI::RecalcLayout() ) on NCurses
# Progress bar for overall progress of software package installation
ProgressBar(
- Id(:progressTotal),
+ Id(UI_ID::TOTAL_PROGRESS),
@total_progress_label,
100,
@total_progress_value
@@ -565,7 +571,7 @@
@_show_table ? DetailsTableWidget() : Empty(),
VWeight(1, LogView(Id(:instLog), _("Actions performed:"), 6, 0)),
ProgressBar(
- Id(:progressCurrentPackage),
+ Id(UI_ID::CURRENT_PACKAGE),
@sub_progress_label,
100,
@sub_progress_value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-3.1.65/library/packages/test/Makefile.am
new/yast2-3.1.67/library/packages/test/Makefile.am
--- old/yast2-3.1.65/library/packages/test/Makefile.am 2014-05-19
16:00:35.000000000 +0200
+++ new/yast2-3.1.67/library/packages/test/Makefile.am 2014-05-23
13:20:21.000000000 +0200
@@ -1,5 +1,6 @@
TESTS = \
- product_test.rb
+ product_test.rb \
+ slide_show_test.rb

TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-3.1.65/library/packages/test/slide_show_test.rb
new/yast2-3.1.67/library/packages/test/slide_show_test.rb
--- old/yast2-3.1.65/library/packages/test/slide_show_test.rb 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-3.1.67/library/packages/test/slide_show_test.rb 2014-05-23
13:20:21.000000000 +0200
@@ -0,0 +1,139 @@
+#! /usr/bin/rspec
+
+top_srcdir = File.expand_path("../../../..", __FILE__)
+inc_dirs = Dir.glob("#{top_srcdir}/library/*/src")
+ENV["Y2DIR"] = inc_dirs.join(":")
+
+require "yast"
+
+Yast.import "SlideShow"
+Yast.import "UI"
+
+include Yast::Logger
+
+describe "Yast::SlideShow" do
+ before(:each) do
+ log.info "--------- Running test ---------"
+ end
+
+ TOTAL_PROGRESS_ID = Yast::SlideShowClass::UI_ID::TOTAL_PROGRESS
+
+ describe "#UpdateGlobalProgress" do
+ before(:each) do
+ allow(Yast::SlideShow).to receive(:ShowingSlide).and_return(false)
+
+ # reseting total progress before each test
+ Yast::SlideShow.UpdateGlobalProgress(0, "")
+ end
+
+ describe "when total progress widget is missing" do
+ it "does not update the total progress" do
+ expect(Yast::UI).to
receive(:WidgetExists).with(TOTAL_PROGRESS_ID).and_return(false)
+ expect(Yast::UI).not_to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
anything(), anything())
+
+ Yast::SlideShow.UpdateGlobalProgress(1, "new label -1")
+ end
+ end
+
+ describe "when total progress widget exists" do
+ before(:each) do
+ allow(Yast::UI).to receive(:WidgetExists).and_return(false)
+ expect(Yast::UI).to
receive(:WidgetExists).with(TOTAL_PROGRESS_ID).and_return(true)
+ end
+
+ it "updates the progress value and label" do
+ expect(Yast::UI).to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Value, 100)
+ expect(Yast::UI).to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Label, "finished")
+
+ Yast::SlideShow.UpdateGlobalProgress(100, "finished")
+ end
+
+ it "updates slides if using slides" do
+ allow(Yast::SlideShow).to receive(:ShowingSlide).and_return(true)
+ expect(Yast::SlideShow).to receive(:ChangeSlideIfNecessary)
+
+ Yast::SlideShow.UpdateGlobalProgress(9, "new label 0")
+ end
+
+ it "does not update progress label when setting it to nil" do
+ expect(Yast::UI).to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Value, 25)
+ expect(Yast::UI).not_to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Label, anything())
+
+ Yast::SlideShow.UpdateGlobalProgress(25, nil)
+ end
+
+ it "does not update progress value when setting it to nil" do
+ expect(Yast::UI).not_to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Value, anything())
+ expect(Yast::UI).to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Label, "new label 1")
+
+ Yast::SlideShow.UpdateGlobalProgress(nil, "new label 1")
+ end
+
+ # optimizes doing useless UI changes
+ it "does not update progress value or label if setting them to their
current value" do
+ expect(Yast::UI).to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Value, 31).once
+ expect(Yast::UI).to receive(:ChangeWidget).with(TOTAL_PROGRESS_ID,
:Label, "new label 5").once
+
+ # updates UI only once
+ 3.times { Yast::SlideShow.UpdateGlobalProgress(31, "new label 5") }
+ end
+ end
+ end
+
+ PACKAGES_PROGRESS_ID = Yast::SlideShowClass::UI_ID::CURRENT_PACKAGE
+
+ describe "#SubProgress" do
+ before(:each) do
+ allow(Yast::UI).to receive(:WidgetExists).and_return(false)
+
+ # reseting sub-progress before each test
+ Yast::SlideShow.SubProgress(0, "")
+ end
+
+ describe "when total progress widget does not exists" do
+ it "does not update the total progress" do
+ expect(Yast::UI).to
receive(:WidgetExists).with(PACKAGES_PROGRESS_ID).and_return(false)
+ expect(Yast::UI).not_to
receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID, anything(), anything())
+
+ Yast::SlideShow.SubProgress(9, "some label")
+ end
+ end
+
+ describe "when total progress widget exists" do
+ before(:each) do
+ expect(Yast::UI).to
receive(:WidgetExists).with(PACKAGES_PROGRESS_ID).and_return(true)
+ end
+
+ it "updates packages progress value and label" do
+ expect(Yast::UI).to receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID,
:Value, 100)
+ expect(Yast::UI).to receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID,
:Label, "finished")
+
+ Yast::SlideShow.SubProgress(100, "finished")
+ end
+
+ it "does not update progress label when setting it to nil" do
+ expect(Yast::UI).to receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID,
:Value, 13)
+ expect(Yast::UI).not_to
receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID, :Label, anything())
+
+ Yast::SlideShow.SubProgress(13, nil)
+ end
+
+ it "does not update progress value when setting it to nil" do
+ expect(Yast::UI).not_to
receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID, :Value, anything())
+ expect(Yast::UI).to receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID,
:Label, "package test 1")
+
+ Yast::SlideShow.SubProgress(nil, "package test 1")
+ end
+
+ # optimizes doing useless UI changes
+ it "does not update progress value or label if setting them to their
current value" do
+ expect(Yast::UI).to receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID,
:Value, 67).once
+ expect(Yast::UI).to receive(:ChangeWidget).with(PACKAGES_PROGRESS_ID,
:Label, "package test 2").once
+
+ # updates UI only once
+ 3.times { Yast::SlideShow.SubProgress(67, "package test 2") }
+ end
+ end
+ end
+
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-3.1.65/library/system/src/clients/view_anymsg.rb
new/yast2-3.1.67/library/system/src/clients/view_anymsg.rb
--- old/yast2-3.1.65/library/system/src/clients/view_anymsg.rb 2014-05-19
16:00:35.000000000 +0200
+++ new/yast2-3.1.67/library/system/src/clients/view_anymsg.rb 2014-05-23
13:20:21.000000000 +0200
@@ -73,8 +73,10 @@
@filenames = Convert.to_string(
SCR.Read(path(".target.string"), Ops.add(@vardir, "/filenames"))
)
- if @filenames == nil || Ops.less_or_equal(Builtins.size(@filenames), 0)
- @filenames = "/var/log/boot.msg\n/var/log/messages\n"
+ if !@filenames || @filenames.empty?
+ @filenames = ""
+ @filenames << "/var/log/boot.log\n"
+ @filenames << "/var/log/messages\n"
end

# convert \n separated string to ycp list.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-3.1.65/library/system/src/modules/Kernel.rb
new/yast2-3.1.67/library/system/src/modules/Kernel.rb
--- old/yast2-3.1.65/library/system/src/modules/Kernel.rb 2014-05-19
16:00:35.000000000 +0200
+++ new/yast2-3.1.67/library/system/src/modules/Kernel.rb 2014-05-23
13:20:21.000000000 +0200
@@ -57,6 +57,7 @@
Yast.import "PackagesProposal"
Yast.import "Popup"
Yast.import "Stage"
+ Yast.import "FileUtils"

textdomain "base"

@@ -608,6 +609,16 @@
# @return [Boolean] true on success
def SaveModulesToLoad
modules_to_load
+
+ unless FileUtils.Exists(MODULES_DIR)
+ log.warn "Directory #{MODULES_DIR} does not exist, creating"
+
+ unless SCR::Execute(path(".target.mkdir"), MODULES_DIR)
+ log.error "Cannot create directory #{MODULES_DIR}"
+ return false
+ end
+ end
+
success = true

@modules_to_load.each do |file, modules|
@@ -693,11 +704,22 @@
def read_modules_to_load
@modules_to_load = {MODULES_CONF_FILE => []}

- SCR::Read(path(".target.dir"), MODULES_DIR).each do |file_name|
+ if FileUtils.Exists(MODULES_DIR)
+ config_files = SCR::Read(path(".target.dir"), MODULES_DIR)
+ else
+ log.error "Cannot read modules to load on boot, directory
#{MODULES_DIR} does not exist"
+ end
+
+ if config_files.nil?
+ log.error "Cannot read config files from #{MODULES_DIR}"
+ config_files = []
+ end
+
+ config_files.each do |file_name|
next unless file_name =~ /^.+\.conf$/

if !register_modules_agent(file_name)
- Builtins.y2error("Cannot register new SCR agent for #{file_path}
file")
+ log.error "Cannot register new SCR agent for #{file_path} file"
next
end

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-3.1.65/library/system/test/kernel_test.rb
new/yast2-3.1.67/library/system/test/kernel_test.rb
--- old/yast2-3.1.65/library/system/test/kernel_test.rb 2014-05-19
16:00:35.000000000 +0200
+++ new/yast2-3.1.67/library/system/test/kernel_test.rb 2014-05-23
13:20:21.000000000 +0200
@@ -1,18 +1,23 @@
#! /usr/bin/rspec

-ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+top_srcdir = File.expand_path("../../../..", __FILE__)
+inc_dirs = Dir.glob("#{top_srcdir}/library/*/src")
+ENV["Y2DIR"] = inc_dirs.join(":")

require "yast"
require "tmpdir"

-include Yast
+include Yast::Logger

Yast.import "Kernel"
+Yast.import "FileUtils"
+Yast.import "SCR"

DEFAULT_DATA_DIR = File.join(File.expand_path(File.dirname(__FILE__)),
"data/modules.d")

describe "Kernel" do
before (:each) do
+ log.info "--- test ---"
stub_const("Yast::KernelClass::MODULES_DIR", DEFAULT_DATA_DIR)
@default_modules = {
Yast::KernelClass::MODULES_CONF_FILE => [],
@@ -21,11 +26,21 @@
"user-added-2.conf"=>["user-module-4"],
}
Yast::Kernel.reset_modules_to_load
+ allow(Yast::FileUtils).to receive(:Exists).and_return(true)
end

describe "#modules_to_load" do
- it "returns hash of modules to load" do
- expect(Yast::Kernel.modules_to_load).to eq(@default_modules)
+ describe "when modules.d directory exists" do
+ it "returns hash of modules to load" do
+ expect(Yast::Kernel.modules_to_load).to eq(@default_modules)
+ end
+ end
+
+ describe "when modules.d directory is missing" do
+ it "returns empty list of modules for modules.d directory" do
+ expect(Yast::FileUtils).to
receive(:Exists).with(Yast::KernelClass::MODULES_DIR).and_return(false)
+ expect(Yast::Kernel.modules_to_load).to
eq({Yast::KernelClass::MODULES_CONF_FILE => []})
+ end
end
end

@@ -74,41 +89,54 @@
end

describe "#SaveModulesToLoad" do
- it "stores all modules to be loaded to configuration files" do
- Dir.mktmpdir do |tmpdir|
- FileUtils.cp_r(DEFAULT_DATA_DIR + "/.", tmpdir)
-
- stub_const("Yast::KernelClass::MODULES_DIR", tmpdir)
- Yast::Kernel.reset_modules_to_load
-
- # Tests on the default data
- ["module-a", "module-b", "user-module-1", "user-module-2",
"user-module-3", "user-module-4"].each do |kernel_module|
- expect(Yast::Kernel.module_to_be_loaded?(kernel_module)).to be_true
- end
+ describe "when modules.d directory does not exist" do
+ it "tries to create the missing directory and returns false if it fails"
do
+ expect(Yast::FileUtils).to receive(:Exists).twice().and_return(false)
+ expect(Yast::SCR).to receive(:Execute).with(
+ Yast::Path.new(".target.mkdir"),
+ anything()
+ ).and_return(false)
+ expect(Yast::Kernel.SaveModulesToLoad).to eq(false)
+ end
+ end

- new_module = "new-kernel-module"
- remove_module = "user-module-2"
+ describe "when modules.d directory exists" do
+ it "stores all modules to be loaded to configuration files and returns
true" do
+ Dir.mktmpdir do |tmpdir|
+ FileUtils.cp_r(DEFAULT_DATA_DIR + "/.", tmpdir)
+
+ stub_const("Yast::KernelClass::MODULES_DIR", tmpdir)
+ Yast::Kernel.reset_modules_to_load
+
+ # Tests on the default data
+ ["module-a", "module-b", "user-module-1", "user-module-2",
"user-module-3", "user-module-4"].each do |kernel_module|
+ expect(Yast::Kernel.module_to_be_loaded?(kernel_module)).to be_true
+ end
+
+ new_module = "new-kernel-module"
+ remove_module = "user-module-2"
+
+ # Modifying data
+ Yast::Kernel.AddModuleToLoad new_module
+ Yast::Kernel.RemoveModuleToLoad remove_module
+
+ expect(Yast::Kernel.SaveModulesToLoad).to be_true
+
+ # Tests on the stored modified data
+ Yast::Kernel.reset_modules_to_load
+ ["module-a", "module-b", "user-module-1", "user-module-3",
"user-module-4", new_module].each do |kernel_module|
+ expect(Yast::Kernel.module_to_be_loaded?(kernel_module)).to be_true
+ end
+
+ expect(Yast::Kernel.module_to_be_loaded?(remove_module)).to be_false
+
+ # Tests directly on the system
+ number_of_nkm = `grep --count --no-filename #{new_module}
#{tmpdir}/*`
+ expect(number_of_nkm.split.map(&:to_i).inject(:+)).to eq(1)

- # Modifying data
- Yast::Kernel.AddModuleToLoad new_module
- Yast::Kernel.RemoveModuleToLoad remove_module
-
- expect(Yast::Kernel.SaveModulesToLoad).to be_true
-
- # Tests on the stored modified data
- Yast::Kernel.reset_modules_to_load
- ["module-a", "module-b", "user-module-1", "user-module-3",
"user-module-4", new_module].each do |kernel_module|
- expect(Yast::Kernel.module_to_be_loaded?(kernel_module)).to be_true
+ number_of_rkm = `grep --count --no-filename #{remove_module}
#{tmpdir}/*`
+ expect(number_of_rkm.split.map(&:to_i).inject(:+)).to eq(0)
end
-
- expect(Yast::Kernel.module_to_be_loaded?(remove_module)).to be_false
-
- # Tests directly on the system
- number_of_nkm = `grep --count --no-filename #{new_module} #{tmpdir}/*`
- expect(number_of_nkm.split.map(&:to_i).inject(:+)).to eq(1)
-
- number_of_rkm = `grep --count --no-filename #{remove_module}
#{tmpdir}/*`
- expect(number_of_rkm.split.map(&:to_i).inject(:+)).to eq(0)
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-3.1.65/package/yast2.changes
new/yast2-3.1.67/package/yast2.changes
--- old/yast2-3.1.65/package/yast2.changes 2014-05-19 16:00:35.000000000
+0200
+++ new/yast2-3.1.67/package/yast2.changes 2014-05-23 13:20:21.000000000
+0200
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Fri May 23 12:35:42 CEST 2014 - locilka@xxxxxxxx
+
+- Added check for existence of /etc/modules.d/ directory in Kernel
+ library, the directory is created when missing (bnc#879428)
+- 3.1.67
+
+-------------------------------------------------------------------
+Fri May 23 09:06:28 UTC 2014 - mfilka@xxxxxxxx
+
+- bnc#879399
+ - offer /var/log/boot.log in SysLog module for view
+- 3.1.66
+
+-------------------------------------------------------------------
Mon May 19 15:42:28 CEST 2014 - locilka@xxxxxxxx

- Always using special InstallationProperties for systemd_unit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-3.1.65/package/yast2.spec
new/yast2-3.1.67/package/yast2.spec
--- old/yast2-3.1.65/package/yast2.spec 2014-05-19 16:00:35.000000000 +0200
+++ new/yast2-3.1.67/package/yast2.spec 2014-05-23 13:20:21.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2
-Version: 3.1.65
+Version: 3.1.67
Release: 0
URL: https://github.com/yast/yast-yast2


continue with "q"...


Checked in at Fri May 23 16:12:39 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread