Hello community, here is the log from the commit of package yast2-s390 for openSUSE:Factory checked in at Mon Sep 19 18:09:52 CEST 2011.
-------- --- yast2-s390/yast2-s390.changes 2011-05-05 11:17:33.000000000 +0200 +++ yast2-s390/yast2-s390.changes 2011-05-13 10:11:41.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 13 03:36:54 EDT 2011 - [email protected] + +- allow to configure zFCP tapes (fate #311718) +- 2.21.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-s390-2.21.0.tar.bz2 New: ---- yast2-s390-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-s390.spec ++++++ --- /var/tmp/diff_new_pack.mJumKk/_old 2011-09-19 18:09:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mJumKk/_new 2011-09-19 18:09:45.000000000 +0200 @@ -19,11 +19,11 @@ Name: yast2-s390 -Version: 2.21.0 -Release: 1 +Version: 2.21.1 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-s390-2.21.0.tar.bz2 +Source0: yast2-s390-2.21.1.tar.bz2 Prefix: /usr @@ -40,7 +40,7 @@ S/390-specific features. %prep -%setup -n yast2-s390-2.21.0 +%setup -n yast2-s390-2.21.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-s390-2.21.0.tar.bz2 -> yast2-s390-2.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/VERSION new/yast2-s390-2.21.1/VERSION --- old/yast2-s390-2.21.0/VERSION 2011-05-05 11:10:31.000000000 +0200 +++ new/yast2-s390-2.21.1/VERSION 2011-05-13 09:52:33.000000000 +0200 @@ -1 +1 @@ -2.21.0 +2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/configure new/yast2-s390-2.21.1/configure --- old/yast2-s390-2.21.0/configure 2011-05-05 11:14:45.000000000 +0200 +++ new/yast2-s390-2.21.1/configure 2011-05-13 10:10:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-s390 2.21.0. +# Generated by GNU Autoconf 2.68 for yast2-s390 2.21.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-s390' PACKAGE_TARNAME='yast2-s390' -PACKAGE_VERSION='2.21.0' -PACKAGE_STRING='yast2-s390 2.21.0' +PACKAGE_VERSION='2.21.1' +PACKAGE_STRING='yast2-s390 2.21.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-s390 2.21.0 to adapt to many kinds of systems. +\`configure' configures yast2-s390 2.21.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-s390 2.21.0:";; + short | recursive ) echo "Configuration of yast2-s390 2.21.1:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-s390 configure 2.21.0 +yast2-s390 configure 2.21.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-s390 $as_me 2.21.0, which was +It was created by yast2-s390 $as_me 2.21.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-s390' - VERSION='2.21.0' + VERSION='2.21.1' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.0" +VERSION="2.21.1" RPMNAME="yast2-s390" MAINTAINER="Arvin Schnell <[email protected]>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-s390 $as_me 2.21.0, which was +This file was extended by yast2-s390 $as_me 2.21.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-s390 config.status 2.21.0 +yast2-s390 config.status 2.21.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/configure.in new/yast2-s390-2.21.1/configure.in --- old/yast2-s390-2.21.0/configure.in 2011-05-05 11:14:42.000000000 +0200 +++ new/yast2-s390-2.21.1/configure.in 2011-05-13 10:10:23.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-s390, 2.21.0, http://bugs.opensuse.org/, yast2-s390) +AC_INIT(yast2-s390, 2.21.1, http://bugs.opensuse.org/, yast2-s390) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.0" +VERSION="2.21.1" RPMNAME="yast2-s390" MAINTAINER="Arvin Schnell <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/src/clients/zfcp_proposal.ycp new/yast2-s390-2.21.1/src/clients/zfcp_proposal.ycp --- old/yast2-s390-2.21.0/src/clients/zfcp_proposal.ycp 2009-07-21 16:37:00.000000000 +0200 +++ new/yast2-s390-2.21.1/src/clients/zfcp_proposal.ycp 2011-05-13 09:32:35.000000000 +0200 @@ -24,7 +24,7 @@ list summary = ZFCPController::Summary(); if (size (summary) == 0) // text for installation summary - summary = [ _("No zFCP disk configured") ]; + summary = [ _("No zFCP device configured") ]; // Fill return map ret = $[ "raw_proposal" : summary, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/src/modules/ZFCPController.ycp new/yast2-s390-2.21.1/src/modules/ZFCPController.ycp --- old/yast2-s390-2.21.0/src/modules/ZFCPController.ycp 2011-05-05 11:09:34.000000000 +0200 +++ new/yast2-s390-2.21.1/src/modules/ZFCPController.ycp 2011-05-13 09:58:23.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Controller settings, input and output functions * Authors: Jiri Srain <[email protected]> * - * $Id: ZFCPController.ycp 59505 2009-11-12 16:52:50Z mzugec $ + * $Id: ZFCPController.ycp 63984 2011-05-13 07:58:22Z aschnell $ * * Representation of the configuration of controller. * Input and output routines. @@ -230,21 +230,6 @@ return $[ "install":[], "remove":[] ]; } -/** - * Check if ZFCP subsystem is available - * @return boolean whether the ZFCP-System is availble at all - */ -global define boolean IsAvailable () { - if (controllers == nil) - { - controllers = (list<map<string,any> >)SCR::Read (.probe.storage); - controllers = filter (map<string,any> c, controllers, { - return c["device"]:"" == "zFCP controller"; - }); - y2milestone ("Found %1 zfcp controllers", size (controllers)); - } - return size (controllers) > 0; -} /** * Get available zfcp controllers @@ -262,28 +247,43 @@ return controllers; } + +/** + * Check if ZFCP subsystem is available + * @return boolean whether the ZFCP-System is availble at all + */ +global boolean IsAvailable() +{ + return size(GetControllers()) > 0; +} + + /** * Get available disks */ -global define void ProbeDisks () { +global void ProbeDisks() +{ /* if (Mode::config ()) return;*/ // popup label - UI::OpenDialog (`Label (_("Reading Configured ZFCP Disks"))); + UI::OpenDialog(`Label(_("Reading Configured ZFCP Devices"))); - list<map<string,any> > disks = (list<map<string,any> >) - SCR::Read (.probe.disk); + list<map<string, any> > disks = (list<map<string, any> >) SCR::Read(.probe.disk); + disks = filter(map<string, any> d, disks, { return d["bus"]:"" == "SCSI"; }); + + list<map<string, any> > tapes = (list<map<string, any> >) SCR::Read(.probe.tape); + tapes = filter(map<string, any> d, tapes, { return d["bus"]:"" == "SCSI"; }); + + list<map<string, any> > disks_tapes = (list<map<string, any> >) merge(disks, tapes); - disks = filter (map<string,any> d, disks, ``( - d["bus"]:"" == "SCSI" - )); integer index = -1; - ZFCPController::devices = listmap (map<string,any> d, disks, ``{ + devices = listmap (map<string, any> d, disks_tapes, { index = index + 1; return $[ index : d ]; }); - UI::CloseDialog (); + + UI::CloseDialog(); } /** @@ -317,7 +317,7 @@ else if (ret == 6) Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate ZFCP disk."), id)); + _("%1: Could not activate ZFCP device."), id)); else if (ret == 7) Report::Error (sformat ( // error report, %1 is device identification diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/src/zfcp/dialogs.ycp new/yast2-s390-2.21.1/src/zfcp/dialogs.ycp --- old/yast2-s390-2.21.0/src/zfcp/dialogs.ycp 2011-05-05 11:09:24.000000000 +0200 +++ new/yast2-s390-2.21.1/src/zfcp/dialogs.ycp 2011-05-13 09:58:23.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <[email protected]> * - * $Id: dialogs.ycp 59505 2009-11-12 16:52:50Z mzugec $ + * $Id: dialogs.ycp 63984 2011-05-13 07:58:22Z aschnell $ */ { @@ -129,7 +129,7 @@ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ - string caption = _("Configured ZFCP Disks"); + string caption = _("Configured ZFCP Devices"); /* Dialog content */ term content = `VBox( @@ -198,7 +198,7 @@ else if (ret == `abort || ret == `cancel) { // yes-no popup - if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving? + if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving? All changes will be lost."))) { ret = nil; @@ -213,7 +213,7 @@ string fcp_lun = descr["detail", "fcp_lun"]:"unknown"; // popup qestion, %1 is device name (eg. /dev/sda) - if (! Popup::YesNo (sformat (_("Remove disk %1?"), dev_name))) + if (! Popup::YesNo (sformat (_("Remove device %1?"), dev_name))) { ret = nil; continue; @@ -252,7 +252,7 @@ string help = ZFCP_HELPS["disk_add"]:""; /* Dialog caption */ - string caption = _("Add New ZFCP Disk"); + string caption = _("Add New ZFCP Device"); string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; if (fcp_lun == nil || fcp_lun == "") @@ -341,7 +341,7 @@ else if (ret == `abort || ret == `cancel) { // yes-no popup - if (! Popup::YesNo (_("Really leave the ZFCP disk configuration without saving? + if (! Popup::YesNo (_("Really leave the ZFCP device configuration without saving? All changes will be lost."))) { ret = nil; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-2.21.0/src/zfcp/helps.ycp new/yast2-s390-2.21.1/src/zfcp/helps.ycp --- old/yast2-s390-2.21.0/src/zfcp/helps.ycp 2009-07-21 16:37:00.000000000 +0200 +++ new/yast2-s390-2.21.1/src/zfcp/helps.ycp 2011-05-13 09:58:23.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Srain <[email protected]> * - * $Id: helps.ycp 30690 2006-05-04 12:15:58Z locilka $ + * $Id: helps.ycp 63984 2011-05-13 07:58:22Z aschnell $ */ { @@ -17,7 +17,7 @@ map ZFCP_HELPS = $[ /* Read dialog help 1/2 */ - "read" : _("<p><b><big>Initializing ZFCP Disk Configuration</big></b><br> + "read" : _("<p><b><big>Initializing ZFCP Device Configuration</big></b><br> Please wait...<br></p>") + /* Read dialog help 2/2 */ @@ -25,7 +25,7 @@ Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving ZFCP Disk Configuration</big></b><br> + "write" : _("<p><b><big>Saving ZFCP Device Configuration</big></b><br> Please wait...<br></p>") + /* Write dialog help 2/2 */ @@ -34,14 +34,14 @@ An additional dialog informs whether it is safe to do so.</p>"), /* Disk selection dialog help 1/3 */ - "disk_selection" : _("<p><b><big>Configured ZFCP Disks</big></b><br> -In this dialog, manage ZFCP disks on your system.</p>") + + "disk_selection" : _("<p><b><big>Configured ZFCP Devices</big></b><br> +In this dialog, manage ZFCP devices on your system.</p>") + /* Disk selection dialog help 2/3 */ -_("<p>To configure a new ZFCP disk, click <b>Add</b>.</p>") + +_("<p>To configure a new ZFCP device, click <b>Add</b>.</p>") + /* Disk selection dialog help 3/3 */ -_("<p>To remove a configured ZFCP disk, select it and click +_("<p>To remove a configured ZFCP device, select it and click <b>Delete</b>.</p>") + /* Disk selection dialog Warning */ @@ -50,8 +50,8 @@ Otherwise there is a potential risk of data corruption.</p>"), /* Disk add help 1/2 */ - "disk_add" : _("<p><b><big>Add New ZFCP Disk</big></b><br> -Enter the identifier of the disk to add. Enter the + "disk_add" : _("<p><b><big>Add New ZFCP Device</big></b><br> +Enter the identifier of the device to add. Enter the <b>Channel Number</b> of the ZFCP controller, the worldwide port number (<b>WWPN</b>), and the <b>FCP-LUN</b> number.</p>") + /* Disk add help 2/2, This is HTML, so finally "<devno>" is displayed as "<devno>" */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
