Hello community,
here is the log from the commit of package yast2-reipl for openSUSE:Factory
checked in at 2014-12-01 14:01:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-reipl (Old)
and /work/SRC/openSUSE:Factory/.yast2-reipl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-reipl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-reipl/yast2-reipl.changes 2014-05-21
16:32:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-reipl.new/yast2-reipl.changes
2014-12-01 14:02:06.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 6 12:41:25 CET 2014 - sch...@suse.de
+
+- Fixed parsing of lsreipl output (bnc#902094)
+- 3.1.5
+
+-------------------------------------------------------------------
Old:
----
yast2-reipl-3.1.4.tar.bz2
New:
----
yast2-reipl-3.1.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-reipl.spec ++++++
--- /var/tmp/diff_new_pack.JaNDax/_old 2014-12-01 14:02:07.000000000 +0100
+++ /var/tmp/diff_new_pack.JaNDax/_new 2014-12-01 14:02:07.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-reipl
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,6 +34,7 @@
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-storage
BuildRequires: yast2-testsuite
+BuildRequires: rubygem(rspec)
Requires: yast2-bootloader
Requires: yast2-storage
++++++ yast2-reipl-3.1.4.tar.bz2 -> yast2-reipl-3.1.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/.travis.yml
new/yast2-reipl-3.1.5/.travis.yml
--- old/yast2-reipl-3.1.4/.travis.yml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-reipl-3.1.5/.travis.yml 2014-12-01 11:03:30.000000000 +0100
@@ -0,0 +1,16 @@
+language: cpp
+compiler:
+ - gcc
+before_install:
+ # disable rvm, use system Ruby
+ - rvm reset
+ - wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
+ - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2
yast2-storage" -g "yast-rake gettext rspec:2.14.1"
+script:
+ - rake check:syntax
+ - rake check:pot
+ - make -f Makefile.cvs
+ - make
+ - sudo make install
+ - make check
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/MAINTAINER
new/yast2-reipl-3.1.5/MAINTAINER
--- old/yast2-reipl-3.1.4/MAINTAINER 2014-05-21 13:19:21.000000000 +0200
+++ new/yast2-reipl-3.1.5/MAINTAINER 2014-12-01 11:03:30.000000000 +0100
@@ -1 +1 @@
-Steffen Winterfeldt <snw...@suse.de>
+Deprecated file. Use `osc maintainer yast2-reipl` instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/README new/yast2-reipl-3.1.5/README
--- old/yast2-reipl-3.1.4/README 2014-05-21 13:19:21.000000000 +0200
+++ new/yast2-reipl-3.1.5/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-This program/library is part of YaST2
-See the file COPYRIGHT.english for license terms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/README.md
new/yast2-reipl-3.1.5/README.md
--- old/yast2-reipl-3.1.4/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-reipl-3.1.5/README.md 2014-12-01 11:03:30.000000000 +0100
@@ -0,0 +1,5 @@
+# YaST - The REIPL Module #
+
+[](https://travis-ci.org/yast/yast-reipl)
+[](https://ci.opensuse.org/view/Yast/job/yast-reipl-master/)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/package/yast2-reipl.changes
new/yast2-reipl-3.1.5/package/yast2-reipl.changes
--- old/yast2-reipl-3.1.4/package/yast2-reipl.changes 2014-05-21
13:19:21.000000000 +0200
+++ new/yast2-reipl-3.1.5/package/yast2-reipl.changes 2014-12-01
11:03:30.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Nov 6 12:41:25 CET 2014 - sch...@suse.de
+
+- Fixed parsing of lsreipl output (bnc#902094)
+- 3.1.5
+
+-------------------------------------------------------------------
Wed May 21 09:46:40 UTC 2014 - jreidin...@suse.com
- do not call reipl mutliple time during installation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/package/yast2-reipl.spec
new/yast2-reipl-3.1.5/package/yast2-reipl.spec
--- old/yast2-reipl-3.1.4/package/yast2-reipl.spec 2014-05-21
13:19:21.000000000 +0200
+++ new/yast2-reipl-3.1.5/package/yast2-reipl.spec 2014-12-01
11:03:30.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-reipl
-Version: 3.1.4
+Version: 3.1.5
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,6 +34,7 @@
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-storage
BuildRequires: yast2-testsuite
+BuildRequires: rubygem(rspec)
Requires: yast2-storage yast2-bootloader
# Wizard::SetDesktopTitleAndIcon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/src/modules/Reipl.rb
new/yast2-reipl-3.1.5/src/modules/Reipl.rb
--- old/yast2-reipl-3.1.4/src/modules/Reipl.rb 2014-05-21 13:19:21.000000000
+0200
+++ new/yast2-reipl-3.1.5/src/modules/Reipl.rb 2014-12-01 11:03:30.000000000
+0100
@@ -133,20 +133,20 @@
lsreipl_lines = result["stdout"].split("\n")
type = lsreipl_lines[0][/ccw$|fcp$|node$/]
if type == "ccw"
- ccw_map = Ops.get_map(configuration, "ccw")
- Ops.set(ccw_map, "device",
Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[0-3]\.[0-3]\.[\h.]*$/]),
"\n "))
- Ops.set(ccw_map, "loadparm",
Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/".*"$/]), "\n \""))
- Ops.set(ccw_map, "parm",
Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/".*"$/]), "\n \""))
+ ccw_map = configuration["ccw"]
+ ccw_map["device"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[0-3]\.[0-3]\.[\h.]*$/]),
"\n ") if lsreipl_lines[1]
+ ccw_map["loadparm"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/".*"$/]), "\n \"") if
lsreipl_lines[2]
+ ccw_map["parm"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/".*"$/]), "\n \"") if
lsreipl_lines[3]
Ops.set(configuration, "ccw", ccw_map)
end
if type == "fcp"
- fcp_map = Ops.get_map(configuration, "fcp")
- Ops.set(ccw_map, "wwpm",
Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[x\h]*$/]), "\n "))
- Ops.set(ccw_map, "lun",
Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/[x\h]*$/]), "\n "))
- Ops.set(ccw_map, "device",
Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/[0-3]\.[0-3]\.[\h.]*$/]),
"\n "))
- Ops.set(ccw_map, "bootprog",
Builtins.deletechars(Convert.to_string(lsreipl_lines[4][/[0-9]*$/]), "\n "))
- Ops.set(ccw_map, "br_lbr",
Builtins.deletechars(Convert.to_string(lsreipl_lines[5][/[0-9]*$/]), "\n "))
- Ops.set(ccw_map, "bootparms",
Builtins.deletechars(Convert.to_string(lsreipl_lines[6][/".*"*$/]), "\n \""))
+ fcp_map = configuration["fcp"]
+ ccw_map["wwpm"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[1][/[x\h]*$/]), "\n ") if
lsreipl_lines[1]
+ ccw_map["lun"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[2][/[x\h]*$/]), "\n ") if
lsreipl_lines[2]
+ ccw_map["device"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[3][/[0-3]\.[0-3]\.[\h.]*$/]),
"\n ") if lsreipl_lines[3]
+ ccw_map["bootprog"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[4][/[0-9]*$/]), "\n ") if
lsreipl_lines[4]
+ ccw_map["br_lbr"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[5][/[0-9]*$/]), "\n ") if
lsreipl_lines[5]
+ ccw_map["bootparms"] =
Builtins.deletechars(Convert.to_string(lsreipl_lines[6][/".*"*$/]), "\n \"") if
lsreipl_lines[6]
Ops.set(configuration, "fcp", fcp_map)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/test/Makefile.am
new/yast2-reipl-3.1.5/test/Makefile.am
--- old/yast2-reipl-3.1.4/test/Makefile.am 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-reipl-3.1.5/test/Makefile.am 2014-12-01 11:03:30.000000000
+0100
@@ -0,0 +1,11 @@
+#
+# Makefile.am for reipl/test
+#
+
+TESTS = reipl_test.rb
+
+TEST_EXTENSIONS = .rb
+RB_LOG_COMPILER = rspec
+VERBOSE = 1
+EXTRA_DIST = $(TESTS)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-reipl-3.1.4/test/reipl_test.rb
new/yast2-reipl-3.1.5/test/reipl_test.rb
--- old/yast2-reipl-3.1.4/test/reipl_test.rb 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-reipl-3.1.5/test/reipl_test.rb 2014-12-01 11:03:30.000000000
+0100
@@ -0,0 +1,27 @@
+#!/usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+Yast.import "Reipl"
+
+describe "Reipl#ReadState" do
+ it "returns map of lsreipl call" do
+ lsreipl_output = "Re-IPL type: ccw
+ Device: 0.0.7e64
+ Loadparm: \"\""
+
+ lsreipl_map = {
+ "ccw" => {"device"=>"0.0.7e64", "loadparm"=>"", "parm"=>""},
+ "fcp" => {"device"=>"", "wwpn"=>"", "lun"=>"",
+ "bootprog"=>"", "br_lba"=>"", "bootparms"=>""},
+ "method" => "ccw",
+ "nss" => {"name"=>"", "loadparm"=>"", "parm"=>""}
+ }
+
+ expect(Yast::SCR).to receive(:Execute).with(anything(),
/lsreipl/).and_return({ "exit" => 0, "stderr" => "", "stdout" => lsreipl_output
})
+
+ expect(Yast::Reipl.ReadState()).to eq( lsreipl_map )
+ end
+
+end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
