Merge pull request #40 from izhu/master

it is a fix for bnc#932170
yast · May 28, 2015 · bb096c8 · bb096c8
2 parents 012800b + c7f6ad4
commit bb096c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/package/yast2-iscsi-lio-server.changes b/package/yast2-iscsi-lio-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 27 15:45:03 CET 2015 - lszhu@suse.de
+
+- remove ":" in target name when identifier is empty (bnc#932170) 
+- 3.1.15
+
 -------------------------------------------------------------------
 Wed Mar  4 12:04:33 CET 2015 - gs@suse.de
 

diff --git a/package/yast2-iscsi-lio-server.spec b/package/yast2-iscsi-lio-server.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-iscsi-lio-server
-Version:        3.1.14
+Version:        3.1.15
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/iscsi-lio-server/widgets.rb b/src/include/iscsi-lio-server/widgets.rb
@@ -1180,11 +1180,7 @@ def storeAddTarget(option_id, option_map)
       option_map = deep_copy(option_map)
       target = uiTarget
       Builtins.y2milestone("storeAddTarget %1", target)
-      @curr_target = Builtins.sformat(
-        "%1:%2",
-        Ops.get_string(target, 0, ""),
-        Ops.get_string(target, 1, "")
-      )
+      @curr_target = target.fetch(0,"") + (target.fetch(1,"") == "" ? "":":") + target.fetch(1,"")
       @curr_tpg = Ops.get_integer(target, 2, -1)
       storeModify(option_id, option_map)