Hello community,
here is the log from the commit of package yast2-iscsi-client for
openSUSE:Factory checked in at 2013-12-02 17:05:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes
2013-11-19 16:29:19.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes
2013-12-02 17:05:45.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 27 13:21:24 CET 2013 - [email protected]
+
+- improve IPv6 support: filter out Scope:Link IPv6 addresses
+- 3.1.2
+
+-------------------------------------------------------------------
Old:
----
yast2-iscsi-client-3.1.1.tar.bz2
New:
----
yast2-iscsi-client-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.iZhgfl/_old 2013-12-02 17:05:46.000000000 +0100
+++ /var/tmp/diff_new_pack.iZhgfl/_new 2013-12-02 17:05:46.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-iscsi-client-3.1.1.tar.bz2 -> yast2-iscsi-client-3.1.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.1/VERSION
new/yast2-iscsi-client-3.1.2/VERSION
--- old/yast2-iscsi-client-3.1.1/VERSION 2013-11-19 13:43:14.000000000
+0100
+++ new/yast2-iscsi-client-3.1.2/VERSION 2013-12-02 14:13:04.000000000
+0100
@@ -1 +1 @@
-3.1.1
+3.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.1/package/yast2-iscsi-client.changes
new/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.1/package/yast2-iscsi-client.changes
2013-11-19 13:43:14.000000000 +0100
+++ new/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.changes
2013-12-02 14:13:04.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Nov 27 13:21:24 CET 2013 - [email protected]
+
+- improve IPv6 support: filter out Scope:Link IPv6 addresses
+- 3.1.2
+
+-------------------------------------------------------------------
Tue Nov 12 14:29:00 CET 2013 - [email protected]
- add IPv6 support (fate #316261)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.1/package/yast2-iscsi-client.spec
new/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.1/package/yast2-iscsi-client.spec
2013-11-19 13:43:14.000000000 +0100
+++ new/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.spec
2013-12-02 14:13:04.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.0
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.1/src/include/iscsi-client/widgets.rb
new/yast2-iscsi-client-3.1.2/src/include/iscsi-client/widgets.rb
--- old/yast2-iscsi-client-3.1.1/src/include/iscsi-client/widgets.rb
2013-11-19 13:43:14.000000000 +0100
+++ new/yast2-iscsi-client-3.1.2/src/include/iscsi-client/widgets.rb
2013-12-02 14:13:04.000000000 +0100
@@ -600,7 +600,7 @@
output = Convert.convert(
SCR.Execute(
path(".target.bash_output"),
- "host #{ip}|head -1|tr -d '\n'"
+ "LC_ALL=POSIX host #{ip}|head -1|tr -d '\n'"
),
:from => "any",
:to => "map <string, any>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-iscsi-client-3.1.1/src/modules/IscsiClientLib.rb
new/yast2-iscsi-client-3.1.2/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.1/src/modules/IscsiClientLib.rb 2013-11-19
13:43:14.000000000 +0100
+++ new/yast2-iscsi-client-3.1.2/src/modules/IscsiClientLib.rb 2013-12-02
14:13:04.000000000 +0100
@@ -383,13 +383,10 @@
elsif Builtins.search(row, "Iface Name:") != nil
iface = Ops.get(Builtins.splitstring(row, " "), 2, "")
iface = Ops.get(@iface_file, iface, iface)
- ret = Builtins.add(
- ret,
- Ops.add(
- Ops.add(Ops.add(Ops.add(portal, " "), target), " "),
- iface
- )
- )
+ # don't add Scope:Link IPv6 address
+ if !portal.start_with?("[fe80:")
+ ret = ret << "#{portal} #{target} #{iface}"
+ end
end
end
Builtins.y2milestone("ScanDiscovered ret:%1", ret)
@@ -1244,12 +1241,15 @@
Ops.add(@offboard_script, " "),
Ops.get_string(l, 0, "")
),
- " | grep ..:..:..:.."
+ " | grep ..:..:..:.." # grep for lines containing MAC
address
)
Builtins.y2milestone("GetOffloadItems cmd:%1", cmd)
out = Convert.to_map(
SCR.Execute(path(".target.bash_output"), cmd)
)
+ # Example for output if offload is supported on interface:
+ # cmd: iscsi_offload eth2
+ # out: $["exit":0, "stderr":"", "stdout":"00:00:c9:b1:bc:7f ip
\n"]
Builtins.y2milestone(
"GetOffloadItems iscsi_offload out:%1",
SCR.Execute(
@@ -1318,12 +1318,15 @@
Builtins.maplist(
Convert.convert(eth, :from => "list", :to => "list <list>")
) do |l|
- cmd = Ops.add("ifconfig ", Ops.get_string(l, 0, ""))
+ cmd = Ops.add("LC_ALL=POSIX ifconfig ", Ops.get_string(l, 0, ""))
Builtins.y2milestone("GetOffloadItems cmd:%1", cmd)
out = Convert.to_map(
SCR.Execute(path(".target.bash_output"), cmd)
)
Builtins.y2milestone("GetOffloadItems out:%1", out)
+ # Search for lines containing "init addr", means IPv4 address.
+ # Regarding the IPv6 support there are no changes needed here
because
+ # the IP address is not used farther.
line = Ops.get(
Builtins.filter(
Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-iscsi-client-3.1.1/test/ipEqual_spec.rb
new/yast2-iscsi-client-3.1.2/test/ipEqual_spec.rb
--- old/yast2-iscsi-client-3.1.1/test/ipEqual_spec.rb 2013-11-19
13:43:14.000000000 +0100
+++ new/yast2-iscsi-client-3.1.2/test/ipEqual_spec.rb 2013-12-02
14:13:04.000000000 +0100
@@ -1,4 +1,4 @@
-#! env rspec
+#! /usr/bin/rspec
require_relative '../src/modules/IscsiClientLib'
describe Yast::IscsiClientLibClass do
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
