Hello community, here is the log from the commit of package yast2-iscsi-client checked in at Mon Feb 26 19:02:49 CET 2007. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2007-02-14 19:08:49.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-iscsi-client/yast2-iscsi-client.changes 2007-02-26 16:07:22.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 26 16:08:07 CET 2007 - mzugec@suse.cz + +- parsing initiatorname.iscsi file fixed (#244767) +- 2.14.5 + +------------------------------------------------------------------- Old: ---- yast2-iscsi-client-2.14.4.tar.bz2 New: ---- yast2-iscsi-client-2.14.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.Q21192/_old 2007-02-26 19:02:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Q21192/_new 2007-02-26 19:02:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.14.4) +# spec file for package yast2-iscsi-client (Version 2.14.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-iscsi-client -Version: 2.14.4 +Version: 2.14.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.14.4.tar.bz2 +Source0: yast2-iscsi-client-2.14.5.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite Requires: yast2 @@ -29,7 +29,7 @@ %prep -%setup -n yast2-iscsi-client-2.14.4 +%setup -n yast2-iscsi-client-2.14.5 %build %{prefix}/bin/y2tool y2autoconf @@ -64,7 +64,10 @@ /usr/share/YaST2/scrconf/iscsid.scr %doc %{prefix}/share/doc/packages/yast2-iscsi-client -%changelog -n yast2-iscsi-client +%changelog +* Mon Feb 26 2007 - mzugec@suse.cz +- parsing initiatorname.iscsi file fixed (#244767) +- 2.14.5 * Wed Feb 14 2007 - mzugec@suse.de - lost chars from user input caused by #245476 (#244388) - InitiatorName is not saved when exiting dialog (#244385) ++++++ yast2-iscsi-client-2.14.4.tar.bz2 -> yast2-iscsi-client-2.14.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.4/src/IscsiClient.ycp new/yast2-iscsi-client-2.14.5/src/IscsiClient.ycp --- old/yast2-iscsi-client-2.14.4/src/IscsiClient.ycp 2007-02-14 19:05:09.000000000 +0100 +++ new/yast2-iscsi-client-2.14.5/src/IscsiClient.ycp 2007-02-26 14:39:09.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: IscsiClient settings, input and output functions * Authors: Michal Zugec <mzugec@suse.cz> * - * $Id: IscsiClient.ycp 35883 2007-02-06 09:51:05Z mzugec $ + * $Id: IscsiClient.ycp 36488 2007-02-26 13:37:03Z mzugec $ * * Representation of the configuration of iscsi-client. * Input and output routines. @@ -284,7 +284,7 @@ ret = (boolean)SCR::Write (.target.string, file, sformat("InitiatorName=%1", initiatorname)); SCR::Execute (.target.bash, "chmod 0600 $FILE" ,$["FILE":file]); } else { - string initiatorname=((map<string, any>)SCR::Execute(.target.bash_output, sformat("cat %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; + string initiatorname=((map<string, any>)SCR::Execute(.target.bash_output, sformat("grep -v '^#' %1 | cut -d'=' -f2 | tr -d '\n'", file)))["stdout"]:""; if (size(name_from_bios)>0 && name_from_bios!=initiatorname){ Popup::Warning( _("InitiatorName from iBFT and from /etc/iscsi/initiatorname.iscsi are differ.\nOld initiatorname will be replaced by value from iBFT and create a backup.\nIf you want to use different initiatorname change it in BIOS.") ); y2milestone("replacing old name %1 by name %2 from iBFT", initiatorname, name_from_bios); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.4/src/widgets.ycp new/yast2-iscsi-client-2.14.5/src/widgets.ycp --- old/yast2-iscsi-client-2.14.4/src/widgets.ycp 2007-02-14 19:05:09.000000000 +0100 +++ new/yast2-iscsi-client-2.14.5/src/widgets.ycp 2007-02-26 14:38:11.000000000 +0100 @@ -173,7 +173,7 @@ } void initInitName(string key){ - initiatorname = ((map<string, any>)SCR::Execute(.target.bash_output, "cat /etc/iscsi/initiatorname.iscsi|grep InitiatorName|cut -d'=' -f2|tr -d '\n'"))["stdout"]:""; + initiatorname = ((map<string, any>)SCR::Execute(.target.bash_output, "grep -v '^#' /etc/iscsi/initiatorname.iscsi|grep InitiatorName|cut -d'=' -f2|tr -d '\n'"))["stdout"]:""; y2milestone("initiatorname %1", initiatorname); UI::ChangeWidget(`initiator_name, `Value, initiatorname); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.14.4/VERSION new/yast2-iscsi-client-2.14.5/VERSION --- old/yast2-iscsi-client-2.14.4/VERSION 2007-02-14 19:05:09.000000000 +0100 +++ new/yast2-iscsi-client-2.14.5/VERSION 2007-02-26 16:07:53.000000000 +0100 @@ -1 +1 @@ -2.14.4 +2.14.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org