Hello community,
here is the log from the commit of package yast2-iscsi-client for
openSUSE:Factory checked in at 2019-03-06 19:02:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client"
Wed Mar 6 19:02:28 2019 rev:122 rq:681465 version:4.1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes
2019-03-04 09:15:54.656649182 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-client.new.28833/yast2-iscsi-client.changes
2019-03-06 19:02:32.145088595 +0100
@@ -1,0 +2,6 @@
+Mon Mar 4 13:36:13 UTC 2019 - jsr...@suse.cz
+
+- fixed parsing of iscsiadm -m node -P 1 (bsc#1121806)
+- 4.1.6
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-4.1.5.tar.bz2
New:
----
yast2-iscsi-client-4.1.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.lHWXUg/_old 2019-03-06 19:02:32.813088415 +0100
+++ /var/tmp/diff_new_pack.lHWXUg/_new 2019-03-06 19:02:32.817088414 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 4.1.5
+Version: 4.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-iscsi-client-4.1.5.tar.bz2 -> yast2-iscsi-client-4.1.6.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.changes
new/yast2-iscsi-client-4.1.6/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.changes
2019-03-01 15:47:03.000000000 +0100
+++ new/yast2-iscsi-client-4.1.6/package/yast2-iscsi-client.changes
2019-03-04 15:12:49.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 4 13:36:13 UTC 2019 - jsr...@suse.cz
+
+- fixed parsing of iscsiadm -m node -P 1 (bsc#1121806)
+- 4.1.6
+
+-------------------------------------------------------------------
Fri Mar 1 13:36:35 UTC 2019 - snw...@suse.com
- fix iBFT handling (bsc#1119698)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.spec
new/yast2-iscsi-client-4.1.6/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-4.1.5/package/yast2-iscsi-client.spec
2019-03-01 15:47:03.000000000 +0100
+++ new/yast2-iscsi-client-4.1.6/package/yast2-iscsi-client.spec
2019-03-04 15:12:49.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 4.1.5
+Version: 4.1.6
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-4.1.5/src/modules/IscsiClientLib.rb
new/yast2-iscsi-client-4.1.6/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-4.1.5/src/modules/IscsiClientLib.rb 2019-03-01
15:47:03.000000000 +0100
+++ new/yast2-iscsi-client-4.1.6/src/modules/IscsiClientLib.rb 2019-03-04
15:12:49.000000000 +0100
@@ -473,12 +473,23 @@
target = ""
portal = ""
iface = ""
+ dumped = true
Builtins.y2milestone("Got data: %1", data)
+ # Each entry starts with Target:, the other two values are optional
+ # (except the first entry) and, if missing, are inherited from previous
+ # entry. Therefore: Dump whatever is cached on Target: entry and once
+ # again at the end. Example input in the test case.
+
Builtins.foreach(data) do |row|
row = Builtins.substring(row, Builtins.findfirstnotof(row, "\t "), 999)
if Builtins.search(row, "Target:") != nil
+ if !dumped
+ # don't add Scope:Link IPv6 address
+ ret << "#{portal} #{target} #{iface}" if
!portal.start_with?("[fe80:")
+ end
target = Ops.get(Builtins.splitstring(row, " "), 1, "")
+ dumped = false
elsif Builtins.search(row, "Portal:") != nil
if Builtins.search(row, "Current Portal:") != nil
portal = Ops.get(Builtins.splitstring(row, " "), 2, "")
@@ -494,12 +505,13 @@
elsif Builtins.search(row, "Iface Name:") != nil
iface = Ops.get(Builtins.splitstring(row, " "), 2, "")
iface = Ops.get(@iface_file, iface, iface)
- # don't add Scope:Link IPv6 address
- if !portal.start_with?("[fe80:")
- ret = ret << "#{portal} #{target} #{iface}"
- end
end
end
+ if !dumped
+ # don't add Scope:Link IPv6 address
+ ret << "#{portal} #{target} #{iface}" if !portal.start_with?("[fe80:")
+ end
+
Builtins.y2milestone("ScanDiscovered ret:%1", ret)
deep_copy(ret)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-4.1.5/test/ScanDiscovered_spec.rb
new/yast2-iscsi-client-4.1.6/test/ScanDiscovered_spec.rb
--- old/yast2-iscsi-client-4.1.5/test/ScanDiscovered_spec.rb 2019-03-01
15:47:03.000000000 +0100
+++ new/yast2-iscsi-client-4.1.6/test/ScanDiscovered_spec.rb 2019-03-04
15:12:49.000000000 +0100
@@ -58,12 +58,14 @@
["Target: iqn.2013-10.de.suse:test_file2",
"\tPortal: [fe80::a00:27ff:fe1b:a7fe]:3260,1",
"\t\tIface Name: default",
+ "Target: iqn.2013-10.de.suse:test_file2",
"\tPortal: [2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260,1",
"\t\tIface Name: default",
+ "Target: iqn.2013-10.de.suse:test_file2",
"\tPortal: 10.120.66.182:3260,1",
- "\t\tIface Name: default",
- "\tPortal: [2620:113:80c0:8080:a00:27ff:fe1b:a7fe]:3260,1",
- "\t\tIface Name: default"]
+ "Target: iqn.2013-10.de.suse:test_file2",
+ "\tPortal: [2620:113:80c0:8080:a00:27ff:fe1b:a7fe]:3260,1"]
+
)). to eq(
[
"[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260
iqn.2013-10.de.suse:test_file2 default",
