Hello community,
here is the log from the commit of package yast2-fcoe-client for
openSUSE:Factory checked in at 2013-12-09 07:27:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old)
and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-fcoe-client"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes
2013-11-21 15:26:29.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes
2013-12-09 07:27:17.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Dec 2 11:45:47 CET 2013 - g...@suse.de
+
+- Enhance help text, improve ruby code
+- 3.1.3
+
+-------------------------------------------------------------------
+Tue Nov 26 11:40:48 CET 2013 - g...@suse.de
+
+- Add 'Requires: fcoe-utils' to spec-file
+- 3.1.2
+
+-------------------------------------------------------------------
Old:
----
yast2-fcoe-client-3.1.1.tar.bz2
New:
----
yast2-fcoe-client-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-fcoe-client.spec ++++++
--- /var/tmp/diff_new_pack.MngM62/_old 2013-12-09 07:27:17.000000000 +0100
+++ /var/tmp/diff_new_pack.MngM62/_new 2013-12-09 07:27:17.000000000 +0100
@@ -17,12 +17,13 @@
Name: yast2-fcoe-client
-Version: 3.1.1
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Requires: fcoe-utils
Requires: yast2 >= 2.21.22
BuildRequires: perl-XML-Writer
BuildRequires: update-desktop-files
++++++ yast2-fcoe-client-3.1.1.tar.bz2 -> yast2-fcoe-client-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-3.1.1/VERSION
new/yast2-fcoe-client-3.1.3/VERSION
--- old/yast2-fcoe-client-3.1.1/VERSION 2013-11-21 09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/VERSION 2013-12-02 14:54:58.000000000 +0100
@@ -1 +1 @@
-3.1.1
+3.1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-fcoe-client-3.1.1/package/yast2-fcoe-client.changes
new/yast2-fcoe-client-3.1.3/package/yast2-fcoe-client.changes
--- old/yast2-fcoe-client-3.1.1/package/yast2-fcoe-client.changes
2013-11-21 09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/package/yast2-fcoe-client.changes
2013-12-02 14:54:58.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Mon Dec 2 11:45:47 CET 2013 - g...@suse.de
+
+- Enhance help text, improve ruby code
+- 3.1.3
+
+-------------------------------------------------------------------
+Tue Nov 26 11:40:48 CET 2013 - g...@suse.de
+
+- Add 'Requires: fcoe-utils' to spec-file
+- 3.1.2
+
+-------------------------------------------------------------------
Wed Nov 20 13:40:58 CET 2013 - g...@suse.de
- Use new name 'fcoe-utils' when checking for installed package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-fcoe-client-3.1.1/package/yast2-fcoe-client.spec
new/yast2-fcoe-client-3.1.3/package/yast2-fcoe-client.spec
--- old/yast2-fcoe-client-3.1.1/package/yast2-fcoe-client.spec 2013-11-21
09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/package/yast2-fcoe-client.spec 2013-12-02
14:54:58.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-fcoe-client
-Version: 3.1.0
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -26,6 +26,7 @@
Group: System/YaST
License: GPL-2.0
Requires: yast2 >= 2.21.22
+Requires: fcoe-utils
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-testsuite
BuildRequires: yast2-devtools >= 3.0.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-fcoe-client-3.1.1/src/clients/fcoe-client_auto.rb
new/yast2-fcoe-client-3.1.3/src/clients/fcoe-client_auto.rb
--- old/yast2-fcoe-client-3.1.1/src/clients/fcoe-client_auto.rb 2013-11-21
09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/src/clients/fcoe-client_auto.rb 2013-12-02
14:54:58.000000000 +0100
@@ -105,7 +105,7 @@
@imported_netcards
)
- # AutoYaST will install package 'open-fcoe' ( checks AutoPackages() )
+ # AutoYaST will install package 'fcoe-utils' ( checks AutoPackages() )
# Start services 'fcoe' and 'lldpad'
@success = FcoeClient.ServiceStatus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-fcoe-client-3.1.1/src/clients/inst_fcoe-client.rb
new/yast2-fcoe-client-3.1.3/src/clients/inst_fcoe-client.rb
--- old/yast2-fcoe-client-3.1.1/src/clients/inst_fcoe-client.rb 2013-11-21
09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/src/clients/inst_fcoe-client.rb 2013-12-02
14:54:58.000000000 +0100
@@ -96,15 +96,16 @@
# workflow not aborted
if @ret == :next
- # add packages open-fcoe (requires lldpad) and yast2-fcoe-client
+ # add packages fcoe-utils (requires lldpd) and yast2-fcoe-client
# to the pool that is used by software proposal
Builtins.y2milestone(
- "Adding packages open-fcoe and yast2-fcoe-client to pool"
+ "Adding packages %1 and yast2-fcoe-client to pool",
+ FcoeClientClass::FCOE_PKG_NAME
)
PackagesProposal.AddResolvables(
"fcoe",
:package,
- ["open-fcoe", "yast2-fcoe-client"]
+ [FcoeClientClass::FCOE_PKG_NAME, "yast2-fcoe-client"]
)
# write changes to config files
Builtins.y2milestone("Writing FCoE config files")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-fcoe-client-3.1.1/src/include/fcoe-client/helps.rb
new/yast2-fcoe-client-3.1.3/src/include/fcoe-client/helps.rb
--- old/yast2-fcoe-client-3.1.1/src/include/fcoe-client/helps.rb
2013-11-21 09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/src/include/fcoe-client/helps.rb
2013-12-02 14:54:58.000000000 +0100
@@ -69,36 +69,49 @@
),
# Services dialog help 1/3
"services" => _(
- "<p><b><big>Starting of services</big><br></b><br>\nEnable or
disable the start of the services <b>fcoe</b> and <b>lldpad</b> at boot
time.</p>\n"
+ "<p><b><big>Starting of services</big><br></b><br>" +
+ "Enable or disable the start of the services <b>fcoe</b> and
<b>lldpad</b> at boot time.</p>"
) +
# Services dialog help 2/3
_(
- "<p>Starting the service <b>fcoe</b> means starting the <i>Fibre
Channel over\n" +
- "Ethernet</i> service daemon <i>fcoemon</i> which controls the
FCoE interfaces and\n" +
+ "<p>Starting the service <b>fcoe</b> means starting the <i>Fibre
Channel over " +
+ "Ethernet</i> service daemon <i>fcoemon</i> which controls the
FCoE interfaces and " +
"establishes a connection with the daemon <i>lldpad</i>.</p>"
) +
# Services dialog help 3/3
_(
- "<p>The <b>lldpad</b> service provides the <i>Link Layer Discovery
Protocol</i> agent daemon <i>lldpad</i>, which informs <i>fcoemon</i> about DCB
(Data Center Bridging) features and configuration of the interfaces.</p>"
+ "<p>The <b>lldpad</b> service provides the <i>Link Layer Discovery
Protocol</i> agent " +
+ "daemon <i>lldpad</i>, which informs <i>fcoemon</i> about DCB
(Data Center Bridging) " +
+ "features and configuration of the interfaces.</p>"
),
- # Interfaces dialog help 1/4
+ # Interfaces dialog help 1/5
"interfaces" => _(
"<p><b><big>Network interface overview</big></b></p>"
) +
- # Interfaces dialog help 2/4
+ # Interfaces dialog help 2/5
_(
- "<p>The interfaces dialog shows all detected netcards including
the status of VLAN and FCoE configuration.<br>FCoE is possible if a VLAN
interface is configured for FCoE on the switch. For every netcard (network
interface), this is shown in column <i>FCoE VLAN Interface</i>.</p>"
+ "<p>The interfaces dialog shows all detected netcards including
the status of VLAN " +
+ "and FCoE configuration.<br>FCoE is possible if a VLAN interface
is configured for FCoE " +
+ "on the switch.<br>" +
+ "For every netcard (network interface), this is shown in column
<i>FCoE VLAN Interface</i>.</p>"
) +
- # Interfaces dialog help 3/4
- _(
- "<p>The values for <i>FCoE VLAN Interface</i> in detail:<br>\n" +
- "<b>not available</b>: Fibre Channel over Ethernet is not
possible (must be enabled on the switch first).<br>\n" +
- "<b>not configured</b>: FCoE is possible but not yet activated.
Press <b>Create FCoE VLAN Interface</b> to activate.<br>\n" +
- " If the FCoE VLAN interface has already been created, the name
is shown in the column, e.g. eth3.200.</p>\n"
+ # Interfaces dialog help 3/5
+ _("<p>It's possible to retry the check for FCoE services by using
<b>Retry Detection</b>" +
+ "(might be required for interfaces needing some time to get
up).</p>"
+ ) +
+ # Interfaces dialog help 4/5
+ _(
+ "<p>The values for <i>FCoE VLAN Interface</i> in detail:<br>" +
+ "<b>not available</b>: Fibre Channel over Ethernet is not
possible " +
+ "(must be enabled on the switch first).<br>" +
+ "<b>not configured</b>: FCoE is possible but not yet
activated.<br>" +
+ "Press <b>Create FCoE VLAN Interface</b> to activate.<br>" +
+ "If the FCoE VLAN interface has already been created, the name "
+
+ "is shown in the column, e.g. eth3.200.</p>"
) +
- # Interfaces dialog help 3/4
+ # Interfaces dialog help 4/5
_(
- "<p>To change the configuration of an existing FCoE VLAN
interface, click on<b>Change Settings</b>.</p>"
+ "<p>To change the configuration of a FCoE VLAN interface, click on
<b>Change Settings</b>.</p>"
),
# Configuration dialog help 1/3
"configuration" => _(
@@ -111,9 +124,9 @@
# Configuration dialog help 3/3
_(
"<p>The values are:<br>\n" +
- "<b>Debug</b>: <i>yes</i> or <i>no</i><br>\n" +
- "This is used to enable or disable debugging messages from the
fcoe service script and <i>fcoemon</i>.<br>\n" +
- "<b>Use syslog</b>: <i>yes</i> or <i>no</i><br>\n" +
+ "<b>Debug</b>: <i>yes</i> or <i>no</i><br>" +
+ "This is used to enable or disable debugging messages from the
fcoe service script and <i>fcoemon</i>.<br>" +
+ "<b>Use syslog</b>: <i>yes</i> or <i>no</i><br>" +
"Messages are sent to the system log if set to <i>yes</i> (data
are logged to /var/log/messages).</p>"
),
# edit dialog help 1/3
@@ -122,20 +135,19 @@
) +
# Edit dialog help 2/3
_(
- "<p>The daemon <i>fcoemon</i> reads these configuration files on
initialization.\n" +
- " There is a file for every interface and the values
indicate whether FCoE instances\n" +
- " should be created and if DCB is required.</p>"
+ "<p>The daemon <i>fcoemon</i> reads these configuration files on
initialization.<br>" +
+ "There is a file for every interface and the values indicate
whether FCoE instances " +
+ "should be created and if DCB is required.</p>"
) +
# Edit dialog help 3/3
_(
- "<p>The values are:<br> \n" +
- "<b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br>\n" +
- "Enable or disable the creation of FCoE instances.<br>\n" +
- "<b>DCB Required</b>: <i>yes</i> or <i>no</i><br>\n" +
- "The default is <i>yes</i>, DCB is usually required.<br>\n" +
- "<b>AUTO VLAN</b>: <i>yes</i> or <i>no</i><br>\n" +
- "If set to <i>yes</i> 'fcoemon' will create the VLAN\n" +
- "interfaces automatically.</p>"
+ "<p>The values are:<br>" +
+ "<b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br>" +
+ "Enable or disable the creation of FCoE instances.<br>" +
+ "<b>DCB Required</b>: <i>yes</i> or <i>no</i><br>" +
+ "The default is <i>yes</i>, DCB is usually required.<br>" +
+ "<b>AUTO VLAN</b>: <i>yes</i> or <i>no</i><br>" +
+ "If set to <i>yes</i> 'fcoemon' will create the VLAN interfaces
automatically.</p>"
)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-fcoe-client-3.1.1/src/modules/FcoeClient.rb
new/yast2-fcoe-client-3.1.3/src/modules/FcoeClient.rb
--- old/yast2-fcoe-client-3.1.1/src/modules/FcoeClient.rb 2013-11-21
09:40:08.000000000 +0100
+++ new/yast2-fcoe-client-3.1.3/src/modules/FcoeClient.rb 2013-12-02
14:54:58.000000000 +0100
@@ -31,6 +31,9 @@
module Yast
class FcoeClientClass < Module
+
+ FCOE_PKG_NAME = "fcoe-utils"
+
def main
Yast.import "UI"
textdomain "fcoe-client"
@@ -269,10 +272,11 @@
# don't check interactively for packages (bnc#367300) -> comment from
iscsi-client
# skip it during initial and second stage or when create AY profile
return true if Stage.cont || Stage.initial || Mode.config
- Builtins.y2milestone("Check if fcoe-utils package installed")
+ Builtins.y2milestone("Check whether package %1 is installed",
+ FcoeClientClass::FCOE_PKG_NAME)
if !Package.InstallMsg(
- "fcoe-utils",
+ FcoeClientClass::FCOE_PKG_NAME,
_(
"<p>To continue the FCoE configuration, the <b>%1</b> package must
be installed.</p>"
) +
@@ -1547,7 +1551,7 @@
# @return [Hash] with 2 lists.
def AutoPackages
# installation of fcoe-utils required
- { "install" => ["fcoe-utils"], "remove" => [] }
+ { "install" => [FcoeClientClass::FCOE_PKG_NAME], "remove" => [] }
end
publish :function => :Modified, :type => "boolean ()"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
