Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2014-11-24 11:13:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-03 13:12:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes 2014-11-24 11:13:10.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 6 15:41:25 CET 2014 - gs@suse.de + +- don't change startup mode for already connected targets when + using the 'Add' button on 'Connected Targets' tab (bnc #886796) +- 3.1.19 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-3.1.18.tar.bz2 New: ---- yast2-iscsi-client-3.1.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.IFj6Cz/_old 2014-11-24 11:13:11.000000000 +0100 +++ /var/tmp/diff_new_pack.IFj6Cz/_new 2014-11-24 11:13:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.18 +Version: 3.1.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-iscsi-client-3.1.18.tar.bz2 -> yast2-iscsi-client-3.1.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.18/.travis.yml new/yast2-iscsi-client-3.1.19/.travis.yml --- old/yast2-iscsi-client-3.1.18/.travis.yml 2014-10-31 17:30:02.000000000 +0100 +++ new/yast2-iscsi-client-3.1.19/.travis.yml 2014-11-14 18:42:11.000000000 +0100 @@ -5,8 +5,10 @@ # disable rvm, use system Ruby - rvm reset - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tra... - - sh ./travis_setup.sh -p "yast2-devtools yast2-testsuite yast2" -g rspec:2.14.1 + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "rspec:2.14.1 yast-rake gettext" script: + - rake check:syntax + - rake check:pot - make -f Makefile.cvs - make - sudo make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.18/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.19/package/yast2-iscsi-client.changes --- old/yast2-iscsi-client-3.1.18/package/yast2-iscsi-client.changes 2014-10-31 17:30:02.000000000 +0100 +++ new/yast2-iscsi-client-3.1.19/package/yast2-iscsi-client.changes 2014-11-14 18:42:11.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 6 15:41:25 CET 2014 - gs@suse.de + +- don't change startup mode for already connected targets when + using the 'Add' button on 'Connected Targets' tab (bnc #886796) +- 3.1.19 + +------------------------------------------------------------------- Wed Oct 22 13:52:08 UTC 2014 - lslezak@suse.cz - removed unnecessary BuildRequires dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.18/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.19/package/yast2-iscsi-client.spec --- old/yast2-iscsi-client-3.1.18/package/yast2-iscsi-client.spec 2014-10-31 17:30:02.000000000 +0100 +++ new/yast2-iscsi-client-3.1.19/package/yast2-iscsi-client.spec 2014-11-14 18:42:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-iscsi-client -Version: 3.1.18 +Version: 3.1.19 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.18/src/include/iscsi-client/widgets.rb new/yast2-iscsi-client-3.1.19/src/include/iscsi-client/widgets.rb --- old/yast2-iscsi-client-3.1.18/src/include/iscsi-client/widgets.rb 2014-10-31 17:30:03.000000000 +0100 +++ new/yast2-iscsi-client-3.1.19/src/include/iscsi-client/widgets.rb 2014-11-14 18:42:11.000000000 +0100 @@ -668,13 +668,24 @@ #y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out); @bg_finish = false # ` with authentication - command = IscsiClientLib.GetDiscoveryCmd(ip, port, false) + + # Check @current_tab (dialogs.rb) here. If it's "client", i.e. the + # 'Add' button at 'Connected Targets' is used, create discovery + # command with option --new. The start-up mode for already connected + # targets won't change then (fate #317874, bnc #886796). + option_new = (@current_tab == "client") + + command = IscsiClientLib.GetDiscoveryCmd(ip, port, + use_fw: false, + only_new: option_new) trg_list = runInBg(command) while !@bg_finish end if Builtins.size(trg_list) == 0 - command = IscsiClientLib.GetDiscoveryCmd(ip, port, true) + command = IscsiClientLib.GetDiscoveryCmd(ip, port, + use_fw: true, + only_new: option_new) trg_list = runInBg(command) while !@bg_finish diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.18/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.19/src/modules/IscsiClientLib.rb --- old/yast2-iscsi-client-3.1.18/src/modules/IscsiClientLib.rb 2014-10-31 17:30:03.000000000 +0100 +++ new/yast2-iscsi-client-3.1.19/src/modules/IscsiClientLib.rb 2014-11-14 18:42:11.000000000 +0100 @@ -1614,8 +1614,9 @@ nil end - def GetDiscoveryCmd(ip, port, fw) - Builtins.y2milestone("GetDiscoveryCmd ip:%1 port:%2 fw:%3", ip, port, fw) + def GetDiscoveryCmd(ip, port, use_fw: false, only_new: false) + Builtins.y2milestone("GetDiscoveryCmd ip:%1 port:%2 fw:%3 only new:%4", + ip, port, use_fw, only_new) command = "-m discovery -P 1" isns_info = useISNS() if isns_info["use"] @@ -1626,7 +1627,7 @@ ifs = Builtins.maplist(ifs) { |s| Ops.add("-I ", s) } Builtins.y2milestone("ifs=%1", ifs) tgt = "st" - tgt = "fw" if fw + tgt = "fw" if use_fw command = Ops.add( command, Builtins.sformat( @@ -1638,6 +1639,8 @@ ) ) end + command << " -o new" if only_new + command = GetAdmCmd(command) Builtins.y2milestone("GetDiscoveryCmd %1", command) command @@ -1683,7 +1686,7 @@ publish :function => :GetOffloadItems, :type => "list <term> ()" publish :function => :GetOffloadModules, :type => "list <string> ()" publish :function => :LoadOffloadModules, :type => "list <string> ()" - publish :function => :GetDiscoveryCmd, :type => "string (string, string, boolean)" + publish :function => :GetDiscoveryCmd, :type => "string (string, string, map)" end IscsiClientLib = IscsiClientLibClass.new -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org