February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67557 - in /trunk/network: package/yast2-network.changes src/installation/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Feb '12

29 Feb '12

Author: jsuchome Date: Wed Feb 29 11:41:24 2012 New Revision: 67557 URL: http://svn.opensuse.org/viewcvs/yast?rev=67557&view=rev Log: - missing break at the end of case statement (bnc#748251) Modified: trunk/network/package/yast2-network.changes trunk/network/src/installation/dialogs.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Wed Feb 29 11:41:24 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 29 11:39:49 CET 2012 - jsuchome(a)suse.cz + +- missing break at the end of case statement (bnc#748251) + +------------------------------------------------------------------- Mon Feb 27 09:38:49 UTC 2012 - mfilka(a)suse.com - installer's proxy config stored on installed system - bnc#693640 Modified: trunk/network/src/installation/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/dialogs… ============================================================================== --- trunk/network/src/installation/dialogs.ycp (original) +++ trunk/network/src/installation/dialogs.ycp Wed Feb 29 11:41:24 2012 @@ -207,6 +207,7 @@ exit=true; break; } + break; case `next: case `back: exit=true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67556 - /tags/branch-unattended-migration-2_17_43_0_3/autoinstallation/
by jsrain＠svn2.opensuse.org 29 Feb '12

29 Feb '12

Author: jsrain Date: Wed Feb 29 10:56:11 2012 New Revision: 67556 URL: http://svn.opensuse.org/viewcvs/yast?rev=67556&view=rev Log: Created tag branch-unattended-migration-2_17_43_0_3 for autoinstallation Added: tags/branch-unattended-migration-2_17_43_0_3/autoinstallation/ (props changed) - copied from r67555, branches/tmp/jsrain/unattended-migration/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67555 - /tags/branch-unattended-migration-2_17_43_0_3/
by jsrain＠svn2.opensuse.org 29 Feb '12

29 Feb '12

Author: jsrain Date: Wed Feb 29 10:56:08 2012 New Revision: 67555 URL: http://svn.opensuse.org/viewcvs/yast?rev=67555&view=rev Log: Created tag branch-unattended-migration-2_17_43_0_3 Added: tags/branch-unattended-migration-2_17_43_0_3/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67554 - in /branches/tmp/jsrain/unattended-migration/autoinstallation: VERSION package/autoyast2.changes src/modules/AutoinstScripts.ycp
by jsrain＠svn2.opensuse.org 29 Feb '12

29 Feb '12

Author: jsrain Date: Wed Feb 29 10:55:53 2012 New Revision: 67554 URL: http://svn.opensuse.org/viewcvs/yast?rev=67554&view=rev Log: fix executing scripts in first stage of AutoUpgrade (bnc#715468) Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/VERSION branches/tmp/jsrain/unattended-migration/autoinstallation/package/autoyast2.changes branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstScripts.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/VERSION (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/VERSION Wed Feb 29 10:55:53 2012 @@ -1 +1 @@ -2.17.43.0.2 +2.17.43.0.3 Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/package/autoyast2.changes (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/package/autoyast2.changes Wed Feb 29 10:55:53 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 29 09:53:58 UTC 2012 - jsrain(a)suse.cz + +- fix executing scripts in first stage of AutoUpgrade (bnc#715468) +- 2.17.43.0.3 + +------------------------------------------------------------------- Wed Feb 23 08:20:27 CET 2011 - jsrain(a)suse.cz - do not reread target map if target system is already mounted Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstScripts.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstScripts.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstScripts.ycp Wed Feb 29 10:55:53 2012 @@ -521,7 +521,7 @@ */ global define boolean Write( string type , boolean special) { - if (!Mode::autoinst ()) + if (!Mode::autoinst () && !Mode::autoupgrade () ) return true; list<map> scripts = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67553 - /tags/stable-2_22_1/dns-server/
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 13:18:26 2012 New Revision: 67553 URL: http://svn.opensuse.org/viewcvs/yast?rev=67553&view=rev Log: Created tag stable-2_22_1 for dns-server Added: tags/stable-2_22_1/dns-server/ - copied from r67552, trunk/dns-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67552 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: gs Date: Tue Feb 28 13:02:12 2012 New Revision: 67552 URL: http://svn.opensuse.org/viewcvs/yast?rev=67552&view=rev Log: improve createHtmlParagraphs (check for doctype tag, escape html), don't show authors label for empty list Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Tue Feb 28 13:02:12 2012 @@ -1326,9 +1326,6 @@ // // createLicenseText // - -#define DOCTYPETAG "" // Special doctype for preformatted HTML - bool NCPackageSelector::showLicensePopup( string pkgName, string license ) { string html_text = ""; Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Tue Feb 28 13:02:12 2012 @@ -102,6 +102,8 @@ return ( toupper( c1 ) == toupper( c2 ) ); } +#define DOCTYPETAG "" // Special doctype for preformatted HTML + /////////////////////////////////////////////////////////////////// // // CLASS NAME : NCPackageSelector Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Tue Feb 28 13:02:12 2012 @@ -43,6 +43,8 @@ #include "NCPkgPackageDetails.h" #include "NCPackageSelector.h" +# include <boost/algorithm/string.hpp> + using namespace zypp; /* @@ -133,9 +135,6 @@ string text = ""; text += commonHeader( pkgPtr ); - //text += " - "; - - //text += pkgPtr->summary(); if ( slbPtr->hasBothObjects () ) { @@ -197,12 +196,15 @@ text += package->sourcePkgName(); text += "-"; text += package->sourcePkgEdition().asString(); - text += " "; + //text += " "; - //authors, in one line - text += NCPkgStrings::Authors(); list<string> authors = package->authors(); // zypp::Package - text += createText( authors, true ); + if ( !authors.empty() ) + { + text += NCPkgStrings::Authors(); + //authors, in one line + text += createText( authors, true ); + } } @@ -266,21 +268,38 @@ string NCPkgPackageDetails::createHtmlParagraphs( string value ) { + yuiDebug() << "Description: " << value << endl; + + // check RichText tag + if ( value.find( string(DOCTYPETAG) ) != string::npos ) + { + return value; // input is rich text + } + // escape html + boost::replace_all( value, "&", "&" ); + boost::replace_all( value, "<", "<" ); + boost::replace_all( value, ">", ">" ); + NCstring input( value ); NCtext descr( input ); NCtext html_descr( NCstring( "" ) ); string description = ""; - list<NCstring>::const_iterator line; for ( line = descr.Text().begin(); line != descr.Text().end(); ++line ) { NCstring curr_line( *line ); + if ( curr_line.Str().empty() ) + { html_descr.append( NCstring("") ); + } else + { html_descr.append( NCstring(" " + curr_line.Str()) ); + } } + html_descr.append( NCstring("") ); for ( line = html_descr.Text().begin(); line != html_descr.Text().end(); ++line ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67551 - /tags/branch-Code-11-SP2-2_17_18/dns-server/
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 12:18:30 2012 New Revision: 67551 URL: http://svn.opensuse.org/viewcvs/yast?rev=67551&view=rev Log: Created tag branch-Code-11-SP2-2_17_18 for dns-server Added: tags/branch-Code-11-SP2-2_17_18/dns-server/ (props changed) - copied from r67550, branches/SuSE-Code-11-SP2-Branch/dns-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67550 - /tags/branch-Code-11-SP1-2_17_14_1/dns-server/
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 12:17:34 2012 New Revision: 67550 URL: http://svn.opensuse.org/viewcvs/yast?rev=67550&view=rev Log: Created tag branch-Code-11-SP1-2_17_14_1 for dns-server Added: tags/branch-Code-11-SP1-2_17_14_1/dns-server/ (props changed) - copied from r67549, branches/SuSE-Code-11-SP1-Branch/dns-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67549 - /tags/branch-Code-11-SP1-2_17_14_1/
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 12:17:31 2012 New Revision: 67549 URL: http://svn.opensuse.org/viewcvs/yast?rev=67549&view=rev Log: Created tag branch-Code-11-SP1-2_17_14_1 Added: tags/branch-Code-11-SP1-2_17_14_1/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67548 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: VERSION package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 12:16:24 2012 New Revision: 67548 URL: http://svn.opensuse.org/viewcvs/yast?rev=67548&view=rev Log: New version Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/VERSION Tue Feb 28 12:16:24 2012 @@ -1 +1 @@ -2.17.14 +2.17.14.1 Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Tue Feb 28 12:16:24 2012 @@ -4,6 +4,7 @@ - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). +- 2.17.14.1 ------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67547 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: VERSION package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 12:16:11 2012 New Revision: 67547 URL: http://svn.opensuse.org/viewcvs/yast?rev=67547&view=rev Log: New version Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/VERSION Tue Feb 28 12:16:11 2012 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Tue Feb 28 12:16:11 2012 @@ -4,6 +4,7 @@ - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). +- 2.17.18 ------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67546 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes
by locilka＠svn2.opensuse.org 28 Feb '12

28 Feb '12

Author: locilka Date: Tue Feb 28 12:15:55 2012 New Revision: 67546 URL: http://svn.opensuse.org/viewcvs/yast?rev=67546&view=rev Log: New version Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=67546&r1=… ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Tue Feb 28 12:15:55 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Tue Feb 28 12:15:55 2012 @@ -4,6 +4,7 @@ - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). +- 2.22.1 ------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67545 - /tags/stable-2_22_4/network/
by mfilka＠svn2.opensuse.org 27 Feb '12

27 Feb '12

Author: mfilka Date: Mon Feb 27 10:42:05 2012 New Revision: 67545 URL: http://svn.opensuse.org/viewcvs/yast?rev=67545&view=rev Log: Created tag stable-2_22_4 for network Added: tags/stable-2_22_4/network/ (props changed) - copied from r67544, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67544 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp
by mfilka＠svn2.opensuse.org 27 Feb '12

27 Feb '12

Author: mfilka Date: Mon Feb 27 10:41:30 2012 New Revision: 67544 URL: http://svn.opensuse.org/viewcvs/yast?rev=67544&view=rev Log: installer's proxy config stored on installed system Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67544&r1=675… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Feb 27 10:41:30 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Feb 27 10:41:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 27 09:38:49 UTC 2012 - mfilka(a)suse.com + +- installer's proxy config stored on installed system - bnc#693640 +- 2.22.4 + +------------------------------------------------------------------- Thu Feb 23 08:52:06 UTC 2012 - mfilka(a)suse.com - added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Mon Feb 27 10:41:30 2012 @@ -130,7 +130,8 @@ ReadInstallInfItem(install_inf, "nisdomain", "NISDomain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); - ReadInstallInfItem(install_inf, "proxy", "Proxy"); + ReadInstallInfItem(install_inf, "proxyUrl", "ProxyUrl"); + ReadInstallInfItem(install_inf, "proxyProto", "ProxyProto"); // ReadInstallInfItem(install_inf, "options", "Options"); // OSAHwAddr parameter s390 ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); @@ -439,12 +440,22 @@ } // create proxy sysconfig file - if (size(InstallInf["proxy"]:"")>0) { - y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); - map ex = Proxy::Export(); + if( (size(InstallInf["proxyProto"]:"")>0) && + (size( InstallInf["proxyUrl"]:"") >0) ) { + y2milestone("Writing proxy settings: %1", InstallInf["proxyUrl"]:""); + Proxy::Read(); + map ex = Proxy::Export(); + + // bnc#693640 - update Proxy module's configuration + // username and password is stored in url because it is handled by linuxrc this way and it is impossible + // to distinguish how the user inserted it (separate or as a part of url?) + ex[ InstallInf[ "proxyProto"]:"" + "_proxy"] = InstallInf[ "proxyUrl"]:""; + Proxy::Import( ex ); Proxy::Write(); + + y2debug( "Written proxy settings: %1", ex); } // create defaultdomain if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67543 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/generic/sections_widget.ycp src/generic/wizards.ycp
by snwint＠svn2.opensuse.org 24 Feb '12

24 Feb '12

Author: snwint Date: Fri Feb 24 16:41:12 2012 New Revision: 67543 URL: http://svn.opensuse.org/viewcvs/yast?rev=67543&view=rev Log: - track section renaming properly in zipl menu (bnc #740324) - 2.17.87 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/sections_widget.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/wizards.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Fri Feb 24 16:41:12 2012 @@ -1 +1 @@ -2.17.86 +2.17.87 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Fri Feb 24 16:41:12 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 24 16:34:16 CET 2012 - snwint(a)suse.de + +- track section renaming properly in zipl menu (bnc #740324) +- 2.17.87 + +------------------------------------------------------------------- Fri Jan 27 14:58:43 CET 2012 - snwint(a)suse.de - fix default menu entry detection (bnc #740324) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/sections_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/sections_widget.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/sections_widget.ycp Fri Feb 24 16:41:12 2012 @@ -172,6 +172,9 @@ BootCommon::current_section = selected; BootCommon::current_section_index = op == `add ? -1 : index; BootCommon::current_section_name = name; + // we need the old name to keep the zipl menu in sync (bnc #740324) + // see fixZiplMenu() + BootCommon::current_section["old_name"] = name; y2internal ("Selected section: %1", BootCommon::current_section); if (BootCommon::current_section["name"]:"" == BootCommon::globals["default"]:"") Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/wizards.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/generic/wizards.ycp Fri Feb 24 16:41:12 2012 @@ -25,6 +25,32 @@ import "CWMTab"; +// bnc #740324 +// When a section is renamed, update the section name list in the zipl menu, too. +// +void fixZiplMenu(string old_name, string new_name) +{ + if (old_name != "" && new_name != "" && old_name != new_name && BootCommon::getLoaderType (false) == "zipl") + { + y2milestone("fixZiplMenu: rename section: %1 -> %2", old_name, new_name); + + BootCommon::sections = maplist (map<string,any> section, BootCommon::sections, + { + if (section["type"]:"" == "menu" && haskey(section, "list")) + { + string l = regexpsub(section["list"]:"", "^(|.*, )" + old_name + "(|,.*)$", "\\1" + new_name + "\\2"); + + if(l != nil) { section["list"] = l; } + + y2milestone("fixZiplMenu: updated menu list = %1", section["list"]:""); + } + + return section; + }); + } +} + + // calculate the list of available section types list<string> section_types () { list<string> st_list = []; @@ -103,9 +129,12 @@ symbol GenericStoreSection () { BootCommon::current_section["__changed"] = true; - y2debug ("Storing section: index: %1, contents: %2", + y2milestone ("Storing section: index: %1, contents: %2", BootCommon::current_section_index, BootCommon::current_section); + + fixZiplMenu(BootCommon::current_section["old_name"]:"", BootCommon::current_section["name"]:""); + if (BootCommon::current_section_index == -1) { BootCommon::sections -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67542 - /tags/stable-2_21_5/nfs-client/
by mfilka＠svn2.opensuse.org 24 Feb '12

24 Feb '12

Author: mfilka Date: Fri Feb 24 13:17:46 2012 New Revision: 67542 URL: http://svn.opensuse.org/viewcvs/yast?rev=67542&view=rev Log: Created tag stable-2_21_5 for nfs-client Added: tags/stable-2_21_5/nfs-client/ (props changed) - copied from r67541, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67541 - /tags/stable-2_21_5/nfs-client/
by mfilka＠svn2.opensuse.org 24 Feb '12

24 Feb '12

Author: mfilka Date: Fri Feb 24 13:17:28 2012 New Revision: 67541 URL: http://svn.opensuse.org/viewcvs/yast?rev=67541&view=rev Log: Removed tag stable-2_21_5 for nfs-client Removed: tags/stable-2_21_5/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67540 - in /trunk/nfs-client: package/yast2-nfs-client.changes testsuite/tests/readwrite.ycp testsuite/tests/readwrite2.ycp
by mfilka＠svn2.opensuse.org 24 Feb '12

24 Feb '12

Author: mfilka Date: Fri Feb 24 13:12:22 2012 New Revision: 67540 URL: http://svn.opensuse.org/viewcvs/yast?rev=67540&view=rev Log: fixed testsuite Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/testsuite/tests/readwrite.ycp trunk/nfs-client/testsuite/tests/readwrite2.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Fri Feb 24 13:12:22 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 24 12:09:03 UTC 2012 - mfilka(a)suse.com + +- fixed testsuite + +------------------------------------------------------------------- Fri Feb 17 13:14:44 UTC 2012 - mfilka(a)suse.com - IPv6 addresses supported - bnc#719538 Modified: trunk/nfs-client/testsuite/tests/readwrite.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite.ycp (original) +++ trunk/nfs-client/testsuite/tests/readwrite.ycp Fri Feb 24 13:12:22 2012 @@ -120,6 +120,9 @@ "NFS4_SUPPORT": "yes", ], ], + "target" : $[ + "stat" : $[ "dummy": true ] + ], ]; map WRITE = $[ Modified: trunk/nfs-client/testsuite/tests/readwrite2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readw… ============================================================================== --- trunk/nfs-client/testsuite/tests/readwrite2.ycp (original) +++ trunk/nfs-client/testsuite/tests/readwrite2.ycp Fri Feb 24 13:12:22 2012 @@ -117,6 +117,9 @@ "NFS4_SUPPORT": "no", ], ], + "target" : $[ + "stat" : $[ "dummy": true ] + ], ]; // services portmap & nfs are stopped. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67539 - /trunk/storage/storage/src/include/ep-all.ycp
by aschnell＠svn2.opensuse.org 24 Feb '12

24 Feb '12

Author: aschnell Date: Fri Feb 24 12:31:58 2012 New Revision: 67539 URL: http://svn.opensuse.org/viewcvs/yast?rev=67539&view=rev Log: - fixed S/390 module detection - nicer ordering of menu entries Modified: trunk/storage/storage/src/include/ep-all.ycp Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Fri Feb 24 12:31:58 2012 @@ -52,6 +52,11 @@ list<term> configs = []; + if (true) { + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); + } + if (IsAvailable("iscsi-client")) { // menu entry text configs = add(configs, `item(`id(`iscsi), `icon("yast-iscsi-client"), _("Configure &iSCSI..."))); @@ -60,15 +65,19 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); - // menu entry text - configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } - if (Arch::s390() && IsAvailable("s390")) { + if (Arch::s390() && IsAvailable("dasd")) { // menu entry text - configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); + configs = add(configs, `item(`id(`dasd), `icon("yast-dasd"), _("Configure &DASD..."))); + } + + if (Arch::s390() && IsAvailable("zfcp")) { // menu entry text - configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); + configs = add(configs, `item(`id(`zfcp), `icon("yast-zfcp"), _("Configure &zFCP..."))); + } + + if (Arch::s390() && IsAvailable("xpram")) { // menu entry text configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67538 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 24 Feb '12

24 Feb '12

Author: aschnell Date: Fri Feb 24 10:42:48 2012 New Revision: 67538 URL: http://svn.opensuse.org/viewcvs/yast?rev=67538&view=rev Log: - improved summary Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 24 10:42:48 2012 @@ -290,16 +290,35 @@ /** - * Create a textual summary and a list of unconfigured cards + * Create a textual summary and a list of configured devices * @return summary of the current configuration */ global list<string> Summary() { - list<string> ret = maplist (integer index, map<string,any> d, devices, { - // summary text, %1 is channel (number), // %2 and %3 are Yes or No - return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", - String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); - }); + list<string> ret = []; + + if (Mode::config()) + { + ret = maplist (integer index, map<string, any> d, devices, { + // summary text, %1 is channel, %2 and %3 are Yes or No + return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", + String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); + }); + } + else + { + map<integer, map<string, any> > active_devices = + filter(integer index, map<string, any> device, devices, { + return device["resource", "io", 0, "active"]:false; + }); + + ret = maplist (integer index, map<string, any> d, active_devices, { + // summary text, %1 is channel, %2 is device name, %3 is Yes or No + return sformat(_("Channel: %1, Device: %2, DIAG: %3"), d["channel"]:"", + d["dev_name"]:"", String::YesNo(d["diag"]:false)); + }); + } + y2milestone("Summary: %1", ret); return ret; } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 24 10:42:48 2012 @@ -302,18 +302,32 @@ /** - * Create a textual summary and a list of unconfigured cards + * Create a textual summary and a list of configured devices * @return summary of the current configuration */ global list<string> Summary() { - list<string> ret = maplist (integer index, map<string,any> d, devices, { - // summary text, %1 is channel, %1 is WWPN, %3 is LUN - // (all of them are numbers) - return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"), - d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", - d["detail", "fcp_lun"]:""); - }); + list<string> ret = []; + + if (Mode::config()) + { + ret = maplist (integer index, map<string,any> d, devices, { + // summary text, %1 is channel, %2 is WWPN, %3 is LUN + return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"), + d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", + d["detail", "fcp_lun"]:""); + }); + } + else + { + ret = maplist (integer index, map<string,any> d, devices, { + // summary text, %1 is channel, %2 is WWPN, %3 is LUN, %4 is device name + return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3, Device: %4"), + d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", + d["detail", "fcp_lun"]:"", d["dev_name"]:""); + }); + } + y2milestone("Summary: %1", ret); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67537 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: aschnell Date: Thu Feb 23 17:14:45 2012 New Revision: 67537 URL: http://svn.opensuse.org/viewcvs/yast?rev=67537&view=rev Log: - use xdigit in regexps Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 23 17:14:45 2012 @@ -91,7 +91,7 @@ global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; + string regexp = "^([[:xdigit:]]{1}).([[:xdigit:]]{1}).([[:xdigit:]]{4})$"; return regexpmatch(channel, regexp); } @@ -100,9 +100,7 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(tolower(channel), "."); - strs[2] = String::PadZeros(strs[2]:"", 4); - return mergestring(strs, "."); + return tolower(channel); } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Thu Feb 23 17:14:45 2012 @@ -16,7 +16,6 @@ import "Mode"; import "Report"; import "Popup"; - import "String"; global map<integer,map<string,any> > devices = $[]; @@ -78,7 +77,7 @@ global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; + string regexp = "^([[:xdigit:]]{1}).([[:xdigit:]]{1}).([[:xdigit:]]{4})$"; return regexpmatch(channel, regexp); } @@ -87,14 +86,12 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(tolower(channel), "."); - strs[2] = String::PadZeros(strs[2]:"", 4); - return mergestring(strs, "."); + return tolower(channel); } global boolean IsValidWWPN(string wwpn) { - string regexp = "^0x([0-9a-fA-F]{1,16})$"; + string regexp = "^0x([[:xdigit:]]{1,16})$"; return regexpmatch(wwpn, regexp); } @@ -108,7 +105,7 @@ global boolean IsValidFCPLUN(string fcp_lun) { - string regexp = "^0x([0-9a-fA-F]{1,16})$"; + string regexp = "^0x([[:xdigit:]]{1,16})$"; return regexpmatch(fcp_lun, regexp); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67536 - in /branches/SuSE-Code-11-SP2-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: tgoettlicher Date: Thu Feb 23 15:15:56 2012 New Revision: 67536 URL: http://svn.opensuse.org/viewcvs/yast?rev=67536&view=rev Log: fixed selection Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/VE… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake Thu Feb 23 15:15:56 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") Modified: branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes Thu Feb 23 15:15:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 23 15:15:07 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection in Table widget (bnc#746156) +- V 2.21.7 + +------------------------------------------------------------------- Fri Feb 17 16:27:15 CET 2012 - tgoettlicher(a)suse.de - Fixed selection and sorting in Table widget (bnc#746156) Modified: branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Thu Feb 23 15:15:56 2012 @@ -295,7 +295,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem && listViewItem->isSelected() ) + if ( listViewItem && _qt_listView->selectedItems().count() > 0 ) selectOrigItem( listViewItem ); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67535 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: tgoettlicher Date: Thu Feb 23 15:13:39 2012 New Revision: 67535 URL: http://svn.opensuse.org/viewcvs/yast?rev=67535&view=rev Log: Fixed bnc#746156 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTable.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67535&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu Feb 23 15:13:39 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "3") +SET(VERSION_PATCH "4") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Thu Feb 23 15:13:39 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 23 15:12:05 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection Table widget (bnc#746156) +- Version: 2.22.4 + +------------------------------------------------------------------- Fri Feb 17 16:17:32 CET 2012 - tgoettlicher(a)suse.de - Fixed selection and sorting in Table widget (bnc#746156) Modified: trunk/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=67535&r1=6… ============================================================================== --- trunk/qt/src/YQTable.cc (original) +++ trunk/qt/src/YQTable.cc Thu Feb 23 15:13:39 2012 @@ -296,7 +296,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem && listViewItem->isSelected() ) + if ( listViewItem && _qt_listView->selectedItems().count() > 0 ) selectOrigItem( listViewItem ); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67534 - /tags/stable-2_22_3/network/
by mfilka＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: mfilka Date: Thu Feb 23 11:37:41 2012 New Revision: 67534 URL: http://svn.opensuse.org/viewcvs/yast?rev=67534&view=rev Log: Created tag stable-2_22_3 for network Added: tags/stable-2_22_3/network/ (props changed) - copied from r67533, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67533 - in /trunk/network: VERSION package/yast2-network.changes src/clients/proxy.ycp src/clients/save_network.ycp src/services/proxy.ycp testsuite/tests/runtime.ycp
by mfilka＠svn2.opensuse.org 23 Feb '12

23 Feb '12

Author: mfilka Date: Thu Feb 23 11:37:07 2012 New Revision: 67533 URL: http://svn.opensuse.org/viewcvs/yast?rev=67533&view=rev Log: - added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 - fixed testsuite - 2.22.3 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/proxy.ycp trunk/network/src/clients/save_network.ycp trunk/network/src/services/proxy.ycp trunk/network/testsuite/tests/runtime.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67533&r1=675… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Feb 23 11:37:07 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Feb 23 11:37:07 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 23 08:52:06 UTC 2012 - mfilka(a)suse.com + +- added popup with security question when proxy url contains password (http://usr:pass@proxy) - bnc 694582 +- fixed testsuite +- 2.22.3 + +------------------------------------------------------------------- Tue Jan 31 17:36:27 CET 2012 - mvidner(a)suse.cz - Simplified NetworkStorage::isDiskOnNetwork, thx locilka (bnc#726057#c12) Modified: trunk/network/src/clients/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/proxy.ycp?re… ============================================================================== --- trunk/network/src/clients/proxy.ycp (original) +++ trunk/network/src/clients/proxy.ycp Thu Feb 23 11:37:07 2012 @@ -44,10 +44,10 @@ /* main ui function */ any ret = ProxyMainDialog(true); y2debug("ret == %1", ret); - + if (ret == `next && Modified ()) Proxy::Write(); - + UI::CloseDialog(); return ret; Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Thu Feb 23 11:37:07 2012 @@ -45,14 +45,14 @@ * @return true on success */ define boolean ReadInstallInfItem(path install_inf, string item, string var) { - if(item == nil || item == "" || var == nil || var == "") + if(item == nil || item == "" || var == nil || var == "") return false; string val = (string) SCR::Read(add(install_inf, var)); - if(val == nil) + if(val == nil) return false; - if(val != "") + if(val != "") InstallInf[item] = val; return true; Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?r… ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Thu Feb 23 11:37:07 2012 @@ -336,6 +336,13 @@ return validate; } + +boolean UrlContainPassword( string url) +{ + map ret = URL::Parse( url); + + return size( ret[ "pass"]:"") > 0 ; +} /** * Proxy dialog * @param standalone true if not run from another ycp client @@ -481,8 +488,8 @@ UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername); UI::ChangeWidget(`id(`frame1), `Enabled, enabled); UI::ChangeWidget(`id(`frame2), `Enabled, enabled); - if ( !Mode::installation() ) - UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; + if ( !Mode::installation() ) + UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; InitSameProxy(); if(enabled == true) UI::SetFocus(`id(`http)); @@ -520,16 +527,30 @@ if(https == prefill) https = ""; if(ftp == prefill) ftp = ""; - if(enabled == false) - break; - else { - if((http == "") && (https == "") && (ftp == "") ){ - /* Popup error text - http, https and ftp proxy URLs are blank */ - if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. + if(enabled == false) + break; + if((http == "") && (https == "") && (ftp == "") ){ + /* Popup error text - http, https and ftp proxy URLs are blank */ + if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. +Really use these settings?"))) + continue; + } + // bnc#694582 - username and password in URL + else + { + boolean password_inside = UrlContainPassword( http) || + UrlContainPassword( https) || + UrlContainPassword( ftp); + + if( (password_inside) && ( ret != "test_proxy")) + { + if(!Popup::ContinueCancel(_("Security warning: +Username and password will be stored unencrypted +in a worldwide readable plaintext file. Really use these settings?"))) - continue; - } - } + continue; + } + } /* check_* */ if(user == "" && pass != "") { /* Popup::Error text */ Modified: trunk/network/testsuite/tests/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/runtime.… ============================================================================== --- trunk/network/testsuite/tests/runtime.ycp (original) +++ trunk/network/testsuite/tests/runtime.ycp Thu Feb 23 11:37:07 2012 @@ -32,6 +32,7 @@ ], "target" : $[ "size" : 1, + "stat" : $[ "dummy": true ] ], ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67532 - in /trunk/s390/src: dasd/wizards.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 18:13:01 2012 New Revision: 67532 URL: http://svn.opensuse.org/viewcvs/yast?rev=67532&view=rev Log: - stricter types Modified: trunk/s390/src/dasd/wizards.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Wed Feb 22 18:13:01 2012 @@ -53,7 +53,7 @@ * Whole configuration of controller * @return sequence result */ -any DASDSequence() +symbol DASDSequence() { map aliases = $[ "read" : [ ``(ReadDialog()), true ], @@ -80,7 +80,7 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("dasd"); - any ret = Sequencer::Run(aliases, sequence); + symbol ret = Sequencer::Run(aliases, sequence); Wizard::CloseDialog(); @@ -93,7 +93,7 @@ * For use with autoinstallation. * @return sequence result */ -any DASDAutoSequence() +symbol DASDAutoSequence() { /* Initialization dialog caption */ string caption = _("Controller Configuration"); @@ -105,7 +105,7 @@ Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - any ret = MainDASDSequence(); + symbol ret = MainDASDSequence(); Wizard::CloseDialog(); Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Wed Feb 22 18:13:01 2012 @@ -53,12 +53,12 @@ * Whole configuration of controller * @return sequence result */ -any ZFCPSequence() +symbol ZFCPSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainZFCPSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : [ ``(ReadDialog()), true ], + "main" : ``(MainZFCPSequence()), + "write" : [ ``(WriteDialog()), true ] ]; map sequence = $[ @@ -80,7 +80,7 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("zfcp"); - any ret = Sequencer::Run(aliases, sequence); + symbol ret = Sequencer::Run(aliases, sequence); Wizard::CloseDialog(); @@ -93,7 +93,7 @@ * For use with autoinstallation. * @return sequence result */ -any ZFCPAutoSequence() +symbol ZFCPAutoSequence() { /* Initialization dialog caption */ string caption = _("Controller Configuration"); @@ -105,7 +105,7 @@ Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); - any ret = MainZFCPSequence(); + symbol ret = MainZFCPSequence(); Wizard::CloseDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67531 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 17:46:51 2012 New Revision: 67531 URL: http://svn.opensuse.org/viewcvs/yast?rev=67531&view=rev Log: - removed apparently unused functions Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 22 17:46:51 2012 @@ -54,25 +54,6 @@ /** - * Abort function - * return boolean return true if abort - */ -global boolean() AbortFunction = GetModified; - - -/** - * Abort function - * @return blah blah lahjk - */ -global boolean Abort() -{ - if(AbortFunction != nil) - return AbortFunction (); - return false; -} - - -/** * Data was modified? * @return true if modified */ Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 17:46:51 2012 @@ -51,24 +51,6 @@ /** - * Abort function - * return boolean return true if abort - */ -global boolean() AbortFunction = GetModified; - - -/** - * Abort function - * @return blah blah lahjk - */ -global boolean Abort() -{ - if(AbortFunction != nil) - return AbortFunction (); - return false; -} - -/** * Data was modified? * @return true if modified */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67530 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 17:33:18 2012 New Revision: 67530 URL: http://svn.opensuse.org/viewcvs/yast?rev=67530&view=rev Log: - removed mostly usless checks - fixed map lockup Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 22 17:33:18 2012 @@ -71,6 +71,7 @@ return false; } + /** * Data was modified? * @return true if modified @@ -112,7 +113,7 @@ string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; return regexpmatch(channel, regexp); } - + global string FormatChannel(string channel) { if (!IsValidChannel(channel)) @@ -193,6 +194,8 @@ y2milestone("Exit code: %1", ret); UI::CloseDialog(); + + disk_configured = false; } } @@ -264,12 +267,6 @@ map<integer, map<string, any> > ret = GetDevices(); - if (min_chan > 0 || min_lcss > 0 || min_css > 0 || - max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) - { - y2milestone("filter devices: %1.%2.%3 to %4.%5.%6", min_css, min_lcss, min_chan, - max_css, max_lcss, max_chan); - ret = filter(integer k, map<string, any> d, ret, { list<string> tmp_strs = splitstring(d["channel"]:"", "."); integer tmp_css = tointeger("0x" + tmp_strs[0]:""); @@ -279,7 +276,6 @@ return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; }); - } return ret; } @@ -352,7 +348,7 @@ disks = filter (map<string,any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); integer count = size (disks); - y2milestone ("Detected %1 DASD disks", count); + y2milestone("number of probed DASD devices %1", count); return count > 0; } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 17:33:18 2012 @@ -44,6 +44,7 @@ */ global boolean modified = false; + /** */ global boolean proposal_valid = false; @@ -202,6 +203,8 @@ y2milestone("Exit code: %1", ret); UI::CloseDialog(); + + disk_configured = false; } } @@ -274,14 +277,8 @@ map<integer, map<string, any> > ret = GetDevices(); - if (min_chan > 0 || min_lcss > 0 || min_css > 0 || - max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) - { - y2milestone("filter devices: %1.%2.%3 to %4.%5.%6", min_css, min_lcss, min_chan, - max_css, max_lcss, max_chan); - ret = filter(integer k, map<string, any> d, ret, { - list<string> tmp_strs = splitstring(d["channel"]:"", "."); + list<string> tmp_strs = splitstring(d["detail", "controller_id"]:"", "."); integer tmp_css = tointeger("0x" + tmp_strs[0]:""); integer tmp_lcss = tointeger("0x" + tmp_strs[1]:""); integer tmp_chan = tointeger("0x" + tmp_strs[2]:""); @@ -289,7 +286,6 @@ return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; }); - } return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67529 - /tags/stable-2_22_5/ldap-client/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 16:40:17 2012 New Revision: 67529 URL: http://svn.opensuse.org/viewcvs/yast?rev=67529&view=rev Log: Created tag stable-2_22_5 for ldap-client Added: tags/stable-2_22_5/ldap-client/ - copied from r67528, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67528 - /tags/stable-2_22_5/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 16:40:02 2012 New Revision: 67528 URL: http://svn.opensuse.org/viewcvs/yast?rev=67528&view=rev Log: Created tag stable-2_22_5 Added: tags/stable-2_22_5/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67527 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 16:39:30 2012 New Revision: 67527 URL: http://svn.opensuse.org/viewcvs/yast?rev=67527&view=rev Log: - fixed handling of certificate download - 2.22.5 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67527&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Feb 22 16:39:30 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Feb 22 16:39:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 16:38:12 CET 2012 - jsuchome(a)suse.cz + +- fixed handling of certificate download +- 2.22.5 + +------------------------------------------------------------------- Tue Feb 21 11:06:29 CET 2012 - jsuchome(a)suse.cz - removed password policies configuration from client, relevant parts Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67527… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Wed Feb 22 16:39:30 2012 @@ -183,6 +183,7 @@ */ boolean SSLConfiguration () { + string certTmpFile = sformat ("%1/__LDAPcert.crt", Directory::tmpdir); string tls_cacertdir = Ldap::tls_cacertdir; string tls_cacertfile = Ldap::tls_cacertfile; UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (1), `VBox( @@ -247,6 +248,50 @@ UI::ChangeWidget (`id (`tls_cacertfile), `Value, file); } } + if (ret == `import_cert) + { + string dir = tls_cacertdir; + if (dir == "") + dir = "/etc/openldap/cacerts/"; + + boolean success = false; + string name = ""; + + string cert_url = (string) UI::QueryWidget (`id (`url), `Value); + string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", cert_url, certTmpFile); + + if (SCR::Execute(.target.bash, curlcmd) != 0) + { + // error message + Popup::Error (_("Could not download the certificate file from specified URL.")); + } + else if (FileUtils::CheckAndCreatePath (dir)) + { + list <string> l = splitstring (cert_url, "/"); + name = l[size(l) - 1]:"downloaded-by-yast2-ldap-client.pem"; + success = SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2/%3'", certTmpFile, dir, name)) == 0; + // rehash cert directory (bnc#662937) + map out = (map)SCR::Execute (.target.bash_output, sformat ("/usr/bin/c_rehash %1", dir)); + if (out["stderr"]:"" != "") + { + y2error ("something went wrong: %1", out); + } + } + + if (success) + { + // popup message, %1 is file name, %2 directory + Popup::Message (sformat (_("The downloaded certificate file + +'%1' + +has been copied to '%2' directory. +"), name, dir)); + + tls_cacertdir = dir; + Ldap::modified = true; + } + } } while (ret != `ok && ret != `cancel); UI::CloseDialog (); @@ -323,7 +368,6 @@ boolean ldap_tls = Ldap::ldap_tls || Ldap::sssd; // force TLS to true if sssd is used string tls_checkpeer = Ldap::tls_checkpeer; boolean login_enabled = Ldap::login_enabled; - string certTmpFile = sformat ("%1/__LDAPcert.crt", Directory::tmpdir); boolean ssl_changed = false; boolean autofs = Ldap::_start_autofs; term autofs_con = `Empty (); @@ -474,82 +518,6 @@ UI::ChangeWidget (`id (`ldaps), `Value, false); } } - if (result == `import_cert) - { - string dir = Ldap::tls_cacertdir; - if (Ldap::tls_cacertdir == "") - dir = "/etc/openldap/cacerts/"; - - UI::OpenDialog ( `opt(`decorated), `HBox( - `HSpacing(1), - `VBox ( - `HSpacing (75), - // InputField label - `InputField (`id (`url), `opt (`hstretch), - _("CA Certificate URL for Download")), - `ButtonBox ( - `PushButton(`id(`ok),`opt(`default,`key_F10), Label::OKButton()), - `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) - ) - ), - `HSpacing(1) - )); - UI::SetFocus (`id (`url)); - - any ret = nil; - boolean success = false; - string name = ""; - - while (true) - { - ret = UI::UserInput (); - if (ret == `cancel) - break; - if (ret == `ok) - { - string cert_url = (string) UI::QueryWidget (`id (`url), `Value); - string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", cert_url, certTmpFile); - - if (SCR::Execute(.target.bash, curlcmd) != 0) - { - // error message - Popup::Error (_("Could not download the certificate file from specified URL.")); - } - else if (FileUtils::CheckAndCreatePath (dir)) - { - list <string> l = splitstring (cert_url, "/"); - name = l[size(l) - 1]:"downloaded-by-yast2-ldap-client.pem"; - success = SCR::Execute (.target.bash, sformat ("/bin/cp -a '%1' '%2/%3'", certTmpFile, dir, name)) == 0; - // rehash cert directory (bnc#662937) - map out = (map)SCR::Execute (.target.bash_output, sformat ("/usr/bin/c_rehash %1", dir)); - if (out["stderr"]:"" != "") - { - y2error ("something went wrong: %1", out); - } - break; - } - } - } - UI::CloseDialog (); - - if (ret == `cancel) - { - continue; - } - if (success) - { - // popup message, %1 is file name, %2 directory - Popup::Message (sformat (_("The downloaded certificate file - -'%1' - -has been copied to '%2' directory. -"), name, dir)); - - Ldap::tls_cacertdir = dir; - Ldap::modified = true; - } - } if (result == `next || result == `advanced) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67526 - /trunk/s390/src/modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 15:52:26 2012 New Revision: 67526 URL: http://svn.opensuse.org/viewcvs/yast?rev=67526&view=rev Log: - fixed filter Modified: trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 15:52:26 2012 @@ -406,7 +406,8 @@ list<map<string, any> > disks_tapes = (list<map<string, any> >) merge(disks, tapes); disks_tapes = maplist (map<string, any> d, disks_tapes, { - return filter(string k, any v, d, { return contains([ "dev_name", "detail" ], k); }); + return filter(string k, any v, d, { return contains([ "dev_name", "detail", + "vendor", "device" ], k); }); }); integer index = -1; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67525 - /trunk/yast2/yast2.spec.in
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:34:41 2012 New Revision: 67525 URL: http://svn.opensuse.org/viewcvs/yast?rev=67525&view=rev Log: removed comment from spec file Modified: trunk/yast2/yast2.spec.in Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=67525&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Feb 22 15:34:41 2012 @@ -1,21 +1,3 @@ -# -# spec file for package yast2.spec.in -# -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - @HEADER-COMMENT@ @HEADER@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67524 - /trunk/yast2/yast2.spec.in
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:31:17 2012 New Revision: 67524 URL: http://svn.opensuse.org/viewcvs/yast?rev=67524&view=rev Log: spec file updated Modified: trunk/yast2/yast2.spec.in Modified: trunk/yast2/yast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/yast2.spec.in?rev=67524&r1… ============================================================================== --- trunk/yast2/yast2.spec.in (original) +++ trunk/yast2/yast2.spec.in Wed Feb 22 15:31:17 2012 @@ -1,16 +1,34 @@ +# +# spec file for package yast2.spec.in +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ -Source1: yast2-rpmlintrc +Group: System/YaST +License: GPL-2.0+ +Source1: yast2-rpmlintrc -BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-perl-bindings +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite # Needed already in build time -BuildRequires: yast2-pkg-bindings >= 2.20.3 yast2-core >= 2.18.12 yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) -PreReq: %fillup_prereq +PreReq: %fillup_prereq # ag_ini section_private Requires: yast2-core >= 2.22.1 @@ -19,69 +37,69 @@ Requires: yast2-ycp-ui-bindings >= 2.18.4 # changed StartPackage callback signature -Requires: yast2-pkg-bindings >= 2.20.3 -Requires: yast2_ui +Requires: yast2-pkg-bindings >= 2.20.3 +Requires: yast2_ui # For Cron Agent, Module Requires: perl-Config-Crontab # for ag_tty (/bin/stty) # for /usr/bin/md5sum -Requires: coreutils sysconfig -Requires: yast2-xml yast2-hardware-detection +Requires: coreutils sysconfig +Requires: yast2-xml yast2-hardware-detection # for SLPAPI.pm -Requires: yast2-perl-bindings +Requires: yast2-perl-bindings # for ag_anyxml -Requires: perl-XML-Simple +Requires: perl-XML-Simple # for GPG.ycp -Requires: gpg2 +Requires: gpg2 # for Punycode.ycp (bnc#651893) -Requires: bind-utils +Requires: bind-utils # xdg-su in .desktops -Recommends: xdg-utils +Recommends: xdg-utils # moved cfg_security.scr -Conflicts: yast2-security <= 2.13.2 +Conflicts: yast2-security <= 2.13.2 # moved ag_netd, cfg_netd.scr, cfg_xinetd.scr -Conflicts: yast2-inetd <= 2.13.4 -Conflicts: yast2-tune < 2.15.6 -Obsoletes: yast2-mail-aliases <= 2.14.0 -Conflicts: yast2-storage < 2.16.4 -Conflicts: yast2-network < 2.16.6 -Conflicts: yast2-sshd < 2.16.1 +Conflicts: yast2-inetd <= 2.13.4 +Conflicts: yast2-tune < 2.15.6 +Obsoletes: yast2-mail-aliases <= 2.14.0 +Conflicts: yast2-storage < 2.16.4 +Conflicts: yast2-network < 2.16.6 +Conflicts: yast2-sshd < 2.16.1 # moved ag_content agent -Conflicts: yast2-instserver <= 2.16.3 +Conflicts: yast2-instserver <= 2.16.3 # InstError -Conflicts: yast2-installation < 2.18.5 +Conflicts: yast2-installation < 2.18.5 -Conflicts: yast2-update < 2.16.1 +Conflicts: yast2-update < 2.16.1 # Modules 'Slides' and 'SlideShow' moved from yast2-packager to yast2 -Conflicts: yast2-packager < 2.17.12 -Conflicts: yast2-mouse < 2.16.0 -Conflicts: autoyast2-installation < 2.16.2 +Conflicts: yast2-packager < 2.17.12 +Conflicts: yast2-mouse < 2.16.0 +Conflicts: autoyast2-installation < 2.16.2 # country_long.ycp and country.ycp moved to yast2 -Conflicts: yast2-country < 2.16.3 +Conflicts: yast2-country < 2.16.3 # DnsServerAPI moved to yast2.rpm (by mzugec) -Conflicts: yast2-dns-server < 2.17.0 +Conflicts: yast2-dns-server < 2.17.0 -Provides: yast2-lib-sequencer -Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard -Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard -Provides: yast2-trans-menu y2t_menu -Obsoletes: yast2-trans-menu y2t_menu +Provides: yast2-lib-sequencer +Obsoletes: yast2-lib-sequencer +Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Provides: yast2-trans-menu y2t_menu +Obsoletes: yast2-trans-menu y2t_menu # moved here from another packages -Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp -Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp -Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm +Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp +Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp +Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml +Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm Provides: yast2-mail-aliases -Summary: YaST2 - Main Package +Summary: YaST2 - Main Package %description This package contains scripts and data needed for SuSE Linux @@ -90,13 +108,13 @@ %package devel-doc Requires: yast2 = %version Group: System/YaST -Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-lib-sequencer-devel -Obsoletes: yast2-devel -Provides: yast2-devel -Requires: yast2-core-devel +Provides: yast2-lib-sequencer-devel +Obsoletes: yast2-lib-sequencer-devel +Obsoletes: yast2-devel +Provides: yast2-devel +Requires: yast2-core-devel -Summary: YaST2 - Development Scripts and Documentation +Summary: YaST2 - Development Scripts and Documentation %description devel-doc This package contains scripts and data needed for a SUSE Linux @@ -185,6 +203,7 @@ @yncludedir@/hwinfo/*.ycp # documentation + %files devel-doc %defattr(-,root,root) @@ -204,3 +223,5 @@ %doc @docdir@/types %doc @docdir@/wizard %doc @docdir@/xml + +%changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67523 - /trunk/core/libycp/src/YCPBuiltinInteger.cc
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 15:23:28 2012 New Revision: 67523 URL: http://svn.opensuse.org/viewcvs/yast?rev=67523&view=rev Log: - fixed example Modified: trunk/core/libycp/src/YCPBuiltinInteger.cc Modified: trunk/core/libycp/src/YCPBuiltinInteger.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinIntege… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinInteger.cc (original) +++ trunk/core/libycp/src/YCPBuiltinInteger.cc Wed Feb 22 15:23:28 2012 @@ -321,7 +321,7 @@ * @param integer base * @return integer * - * @usage tointeger("20", 8) -> 8 + * @usage tointeger("20", 8) -> 16 * @usage tointeger("20", 10) -> 20 * @usage tointeger("20", 16) -> 32 * @usage tointeger("0x20", 16) -> 32 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67522 - /trunk/yast2/package/yast2.changes
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:22:51 2012 New Revision: 67522 URL: http://svn.opensuse.org/viewcvs/yast?rev=67522&view=rev Log: changelog updated Modified: trunk/yast2/package/yast2.changes Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Feb 22 15:22:51 2012 @@ -2,7 +2,9 @@ Wed Feb 22 12:57:01 UTC 2012 - mfilka(a)suse.com - bnc#694582 - addedd @ as it is allowed in authority part of URI. -- fixed testsuite for WorkFlow.ycp - corrupted due to previous commit +- improve Exists(), don't return 'true' if SCR::Read() returned nil +- fixed testsuite for WorkFlow.ycp - corrupted due to above Exists() fix +- added String::YesNo - 2.22.4 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67521 - in /trunk/core: ./ libycp/src/ libycp/testsuite/tests/builtin/ package/
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 15:19:20 2012 New Revision: 67521 URL: http://svn.opensuse.org/viewcvs/yast?rev=67521&view=rev Log: - added tointeger builtin with explicite base qualification Modified: trunk/core/VERSION trunk/core/libycp/src/YCPBuiltinInteger.cc trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=67521&r1=67520&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Wed Feb 22 15:19:20 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/core/libycp/src/YCPBuiltinInteger.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinIntege… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinInteger.cc (original) +++ trunk/core/libycp/src/YCPBuiltinInteger.cc Wed Feb 22 15:19:20 2012 @@ -18,6 +18,8 @@ /-*/ +#include <sstream> + #include "ycp/YCPBuiltinInteger.h" #include "ycp/YCPInteger.h" #include "ycp/YCPString.h" @@ -40,7 +42,7 @@ * 1 + 2 -> 3 * </pre> */ - + if (i1.isNull () || i2.isNull ()) return YCPNull (); @@ -264,15 +266,16 @@ static YCPValue -i_tointeger (const YCPValue &v) +i_tointeger1(const YCPValue &v) { /** * @builtin tointeger + * @id tointeger-1 * @short Converts a value to an integer. * @description * If the value can't be converted to an integer, nil is returned. * @param any VALUE - * @return integer + * @return integer * * @usage tointeger (4.03) -> 4 * @usage tointeger ("42") -> 42 @@ -305,6 +308,48 @@ } +static YCPValue +i_tointeger2(const YCPString& v, const YCPInteger& b) +{ + /** + * @builtin tointeger + * @id tointeger-2 + * @short Converts a string to an integer. + * @description + * If the value can't be converted to an integer, nil is returned. + * @param string value + * @param integer base + * @return integer + * + * @usage tointeger("20", 8) -> 8 + * @usage tointeger("20", 10) -> 20 + * @usage tointeger("20", 16) -> 32 + * @usage tointeger("0x20", 16) -> 32 + */ + + std::istringstream s(v->value_cstr()); + s.imbue(std::locale::classic()); + + switch (b->value()) + { + case 8: s >> std::oct; break; + case 10: s >> std::dec; break; + case 16: s >> std::hex; break; + + default: + return YCPNull(); + } + + long long int i; + s >> i; + + if (s.fail() || !s.eof()) + return YCPNull(); + + return YCPInteger(i); +} + + YCPBuiltinInteger::YCPBuiltinInteger () { // must be static, registerDeclarations saves a pointer to it! @@ -323,7 +368,8 @@ { "<<", "integer (integer, integer)", (void *)i_left, ETC }, { ">>", "integer (integer, integer)", (void *)i_right, ETC }, { "~", "integer (integer)", (void *)i_bnot, ETC }, - { "tointeger", "integer (const any)", (void *)i_tointeger,ETC }, + { "tointeger", "integer (const any)", (void *)i_tointeger1, ETC }, + { "tointeger", "integer (string, integer)", (void *)i_tointeger2, ETC }, { NULL, NULL, NULL, ETC } #undef ETC #undef ETCf Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.err Wed Feb 22 15:19:20 2012 @@ -161,3 +161,55 @@ (tointeger ("foo") == nil) ---------------------------------------------------------------------- [Interpreter] tests/builtin/Builtin-Integer.ycp:74 Cannot convert 'foo' to an integer +Parsed: +---------------------------------------------------------------------- +"** conversions with explicite base **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("1", 8) == 1) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("1", 10) == 1) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("1", 16) == 1) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("10", 8) == 8) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("10", 10) == 10) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("10", 16) == 16) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("010", 8) == 8) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("010", 10) == 10) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("010", 16) == 16) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("0x10", 8) == nil) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("0x10", 10) == nil) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +(tointeger ("0x10", 16) == 16) +---------------------------------------------------------------------- Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.out Wed Feb 22 15:19:20 2012 @@ -38,3 +38,16 @@ (true) (true) (true) +("** conversions with explicite base **") +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) +(true) Modified: trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/testsuite/tests/buil… ============================================================================== --- trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp (original) +++ trunk/core/libycp/testsuite/tests/builtin/Builtin-Integer.ycp Wed Feb 22 15:19:20 2012 @@ -72,3 +72,20 @@ (tointeger ("042") == 34) (tointeger ("") == nil) (tointeger ("foo") == nil) + + +("** conversions with explicite base **") + +(tointeger ("1", 8) == 1) +(tointeger ("1", 10) == 1) +(tointeger ("1", 16) == 1) +(tointeger ("10", 8) == 8) +(tointeger ("10", 10) == 10) +(tointeger ("10", 16) == 16) +(tointeger ("010", 8) == 8) +(tointeger ("010", 10) == 10) +(tointeger ("010", 16) == 16) +(tointeger ("0x10", 8) == nil) +(tointeger ("0x10", 10) == nil) +(tointeger ("0x10", 16) == 16) + Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Wed Feb 22 15:19:20 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 14:59:37 CET 2012 - aschnell(a)suse.de + +- added tointeger builtin with explicite base qualification +- 2.22.4 + +------------------------------------------------------------------- Fri Feb 3 14:36:31 CET 2012 - mvidner(a)suse.cz - ini-agent: only change permissions of new files (bnc#743355) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67520 - /trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc
by gs＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: gs Date: Wed Feb 22 15:12:55 2012 New Revision: 67520 URL: http://svn.opensuse.org/viewcvs/yast?rev=67520&view=rev Log: use yuiDebug to log info Modified: trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc Modified: trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterRPMGr… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterRPMGroups.cc Wed Feb 22 15:12:55 2012 @@ -217,7 +217,7 @@ // is the requested rpm group a prefix of this package's group? if ( pkg->group ().find (group_str) == 0 ) { - yuiError() << slb->name() << endl; + yuiDebug() << slb->name() << endl; packageList->createListEntry( pkg, slb ); return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67519 - /trunk/ncurses-pkg/src/NCPkgTable.cc
by gs＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: gs Date: Wed Feb 22 15:12:10 2012 New Revision: 67519 URL: http://svn.opensuse.org/viewcvs/yast?rev=67519&view=rev Log: remove obsolete code Modified: trunk/ncurses-pkg/src/NCPkgTable.cc Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Wed Feb 22 15:12:10 2012 @@ -755,7 +755,6 @@ // show the patch info if (objPtr && slbPtr ) updateInfo( objPtr, slbPtr, VisibleInfo() ); - //packager->showPatchInformation( objPtr, slbPtr ); break; default: break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67518 - /tags/stable-2_22_4/yast2/
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:08:20 2012 New Revision: 67518 URL: http://svn.opensuse.org/viewcvs/yast?rev=67518&view=rev Log: Created tag stable-2_22_4 for yast2 Added: tags/stable-2_22_4/yast2/ (props changed) - copied from r67517, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67517 - /tags/stable-2_22_4/yast2/
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:08:00 2012 New Revision: 67517 URL: http://svn.opensuse.org/viewcvs/yast?rev=67517&view=rev Log: Removed tag stable-2_22_4 for yast2 Removed: tags/stable-2_22_4/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67516 - /trunk/yast2/package/yast2.changes
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 15:05:40 2012 New Revision: 67516 URL: http://svn.opensuse.org/viewcvs/yast?rev=67516&view=rev Log: - updated changelog Modified: trunk/yast2/package/yast2.changes Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Feb 22 15:05:40 2012 @@ -2,6 +2,7 @@ Wed Feb 22 12:57:01 UTC 2012 - mfilka(a)suse.com - bnc#694582 - addedd @ as it is allowed in authority part of URI. +- fixed testsuite for WorkFlow.ycp - corrupted due to previous commit - 2.22.4 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67515 - /trunk/yast2/library/control/testsuite/tests/WorkflowManager.ycp
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 14:58:21 2012 New Revision: 67515 URL: http://svn.opensuse.org/viewcvs/yast?rev=67515&view=rev Log: fixed testcase for WorkFlow.ycp (corrupted due to fix in FileUtils::Exists) Modified: trunk/yast2/library/control/testsuite/tests/WorkflowManager.ycp Modified: trunk/yast2/library/control/testsuite/tests/WorkflowManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/testsuite/… ============================================================================== --- trunk/yast2/library/control/testsuite/tests/WorkflowManager.ycp (original) +++ trunk/yast2/library/control/testsuite/tests/WorkflowManager.ycp Wed Feb 22 14:58:21 2012 @@ -7,6 +7,7 @@ map READ = $[ "target" : $[ "size" : 0, + "stat" : $[ "dummy": true ] ], ]; @@ -14,7 +15,9 @@ map EXEC = $[]; -TESTSUITE_INIT([READ, WRITE, EXEC], nil); +list MOCK = [READ, WRITE, EXEC]; + +TESTSUITE_INIT( MOCK, nil); import "WorkflowManager"; import "ProductControl"; @@ -28,29 +31,29 @@ // init <-- -TEST (``(WorkflowManager::SetBaseWorkflow (false)), [], nil); +TEST (``(WorkflowManager::SetBaseWorkflow (false)), MOCK, nil); DUMP (""); DUMP ("Adding new Add-On product"); -TEST (``(WorkflowManager::AddWorkflow (`addon, 3, "")), [], nil); -TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil); +TEST (``(WorkflowManager::AddWorkflow (`addon, 3, "")), MOCK, nil); +TEST (``(WorkflowManager::GetAllUsedControlFiles ()), MOCK, nil); DUMP (""); DUMP ("Adding another Add-On product"); -TEST (``(WorkflowManager::AddWorkflow (`addon, 12, "")), [], nil); -TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil); +TEST (``(WorkflowManager::AddWorkflow (`addon, 12, "")), MOCK, nil); +TEST (``(WorkflowManager::GetAllUsedControlFiles ()), MOCK, nil); DUMP (""); DUMP ("Removing the first Add-On product"); -TEST (``(WorkflowManager::RemoveWorkflow (`addon, 3, "")), [], nil); -TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil); +TEST (``(WorkflowManager::RemoveWorkflow (`addon, 3, "")), MOCK, nil); +TEST (``(WorkflowManager::GetAllUsedControlFiles ()), MOCK, nil); DUMP (""); DUMP ("Removing the first Add-On product"); -TEST (``(WorkflowManager::MergeWorkflows ()), [READ, WRITE, EXEC], nil); +TEST (``(WorkflowManager::MergeWorkflows ()), MOCK, nil); DUMP (""); DUMP ("Current Settings"); -TEST (``(WorkflowManager::DumpCurrentSettings ()), [], nil); +TEST (``(WorkflowManager::DumpCurrentSettings ()), MOCK, nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67514 - /tags/stable-2_22_4/yast2/
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 14:01:11 2012 New Revision: 67514 URL: http://svn.opensuse.org/viewcvs/yast?rev=67514&view=rev Log: Created tag stable-2_22_4 for yast2 Added: tags/stable-2_22_4/yast2/ (props changed) - copied from r67513, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67513 - in /trunk/yast2: VERSION library/types/src/URL.ycp package/yast2.changes
by mfilka＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: mfilka Date: Wed Feb 22 13:59:55 2012 New Revision: 67513 URL: http://svn.opensuse.org/viewcvs/yast?rev=67513&view=rev Log: - Can configure proxy with username/password in url - bnc#694582 Modified: trunk/yast2/VERSION trunk/yast2/library/types/src/URL.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67513&r1=67512… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Feb 22 13:59:55 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/yast2/library/types/src/URL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/URL.ycp?… ============================================================================== --- trunk/yast2/library/types/src/URL.ycp (original) +++ trunk/yast2/library/types/src/URL.ycp Wed Feb 22 13:59:55 2012 @@ -29,8 +29,12 @@ /** * Valid characters in URL + * + * bnc#694582 - addedd @ as it is allowed in authority part of URI. + * for details see RFC2616 and RFC2396 + * */ -global string ValidChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:_-/%"; +global string ValidChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:_-/%@"; /** Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Feb 22 13:59:55 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 12:57:01 UTC 2012 - mfilka(a)suse.com + +- bnc#694582 - addedd @ as it is allowed in authority part of URI. +- 2.22.4 + +------------------------------------------------------------------- Tue Jan 31 14:44:38 CET 2012 - tgoettlicher(a)suse.de - Fixed typo -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67512 - /tags/stable-2_22_2/product-creator/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 13:26:20 2012 New Revision: 67512 URL: http://svn.opensuse.org/viewcvs/yast?rev=67512&view=rev Log: Created tag stable-2_22_2 for product-creator Added: tags/stable-2_22_2/product-creator/ - copied from r67511, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67511 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 13:25:45 2012 New Revision: 67511 URL: http://svn.opensuse.org/viewcvs/yast?rev=67511&view=rev Log: - do not show duplicates in locale entry (bnc#748122) - 2.22.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6751… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Feb 22 13:25:45 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Feb 22 13:25:45 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 13:19:58 CET 2012 - jsuchome(a)suse.cz + +- do not show duplicates in locale entry (bnc#748122) +- 2.22.2 + +------------------------------------------------------------------- Wed Jan 25 10:16:54 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Wed Feb 22 13:25:45 2012 @@ -100,7 +100,7 @@ string logs_directory = "/tmp"; // all available locales - global list<string> all_locales = []; + global map<string,integer> all_locales = $[]; // all available time zones global list<string> all_timezones = []; Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Feb 22 13:25:45 2012 @@ -652,15 +652,16 @@ string lang = KiwiConfig["preferences",0,id,0,content_key]:""; list items = []; - if (Kiwi::all_locales == []) + if (Kiwi::all_locales == $[]) { map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale -a"); - Kiwi::all_locales = filter (string s, splitstring (out["stdout"]:"", "\n"), { - return s != ""; + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + string code = splitstring (line, ".@")[0]:line; + if (code != "") + Kiwi::all_locales[code] = 1; }); } - foreach (string line, Kiwi::all_locales, { - string code = splitstring (line, ".@")[0]:line; + foreach (string code, integer i, Kiwi::all_locales, { items = add (items, `item (`id (code), code, lang == code)); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67510 - in /trunk/s390: package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/ZFCPController.ycp src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 12:43:25 2012 New Revision: 67510 URL: http://svn.opensuse.org/viewcvs/yast?rev=67510&view=rev Log: - more input checks - some fixes Modified: trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Wed Feb 22 12:43:25 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 22 12:21:42 CET 2012 - aschnell(a)suse.de + +- make ZFCP module work with AutoYaST editor + +------------------------------------------------------------------- Wed Feb 15 11:25:49 CET 2012 - aschnell(a)suse.de - make DASD module work with AutoYaST editor Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 22 12:43:25 2012 @@ -529,8 +529,7 @@ if (DASDController::GetDeviceIndex(channel) != nil) { // error popup - Popup::Error(_("Channel already exists.")); - UI::SetFocus(`channel); + Popup::Error(_("Device already exists.")); ret = nil; continue; } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 12:43:25 2012 @@ -182,9 +182,9 @@ if (!Mode::normal()) { foreach (integer index, map<string, any> device, devices, { - string channel = device["controller_id"]:""; - string wwpn = device["wwpn"]:""; - string lun = device["fcp_lun"]:""; + string channel = device["detail", "controller_id"]:""; + string wwpn = device["detail", "wwpn"]:""; + string lun = device["detail", "fcp_lun"]:""; ActivateDisk(channel, wwpn, lun); }); } @@ -313,11 +313,13 @@ global integer - GetDeviceIndex(string channel) + GetDeviceIndex(string channel, string wwpn, string lun) { integer ret = nil; foreach(integer index , map<string, any> d, devices, { - if (d["channel"]:"" == channel) + if (d["detail", "controller_id"]:"" == channel && + d["detail", "wwpn"]:"" == wwpn && + d["detail", "fcp_lun"]:"" == lun) ret = index; }); return ret; @@ -367,6 +369,10 @@ return c["device"]:"" == "zFCP controller"; }); + controllers = maplist (map<string, any> c, controllers, { + return filter(string k, any v, c, { return contains([ "sysfs_bus_id" ], k); }); + }); + y2milestone ("probed ZFCP controllers %1", controllers); } return controllers; @@ -399,6 +405,10 @@ list<map<string, any> > disks_tapes = (list<map<string, any> >) merge(disks, tapes); + disks_tapes = maplist (map<string, any> d, disks_tapes, { + return filter(string k, any v, d, { return contains([ "dev_name", "detail" ], k); }); + }); + integer index = -1; devices = listmap (map<string, any> d, disks_tapes, { index = index + 1; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Wed Feb 22 12:43:25 2012 @@ -243,7 +243,8 @@ string caption = _("Add New ZFCP Device"); string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; - fcp_lun = ZFCPController::GetNextLUN(fcp_lun); + if (!isempty(fcp_lun)) + fcp_lun = ZFCPController::GetNextLUN(fcp_lun); list<string> items = []; if (Mode::config ()) @@ -252,13 +253,11 @@ return d["detail", "controller_id"]:""; }); items = toset (items); - items = filter (string i, items, { return i != "" && i != nil; }); } else { items = maplist (map<string, any> c, ZFCPController::GetControllers(), { - string channel = c["sysfs_bus_id"]:""; - return channel; + return c["sysfs_bus_id"]:""; }); } @@ -391,6 +390,18 @@ ret = nil; continue; } + + channel = ZFCPController::FormatChannel(channel); + wwpn = ZFCPController::FormatWWPN(wwpn); + fcp_lun = ZFCPController::FormatFCPLUN(fcp_lun); + + if (ZFCPController::GetDeviceIndex(channel, wwpn, fcp_lun) != nil) + { + // error popup + Popup::Error(_("Device already exists.")); + ret = nil; + continue; + } } } @@ -423,6 +434,8 @@ else { ZFCPController::ActivateDisk (channel, wwpn, lun); + + ZFCPController::ProbeDisks(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67509 - in /trunk/iplb: ./ agents/ doc/ doc/autodocs/ package/ src/ testsuite/ testsuite/tests/
by deanraccoon＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: deanraccoon Date: Wed Feb 22 11:55:23 2012 New Revision: 67509 URL: http://svn.opensuse.org/viewcvs/yast?rev=67509&view=rev Log: add iplb to svn repo Added: trunk/iplb/ trunk/iplb/.cvsignore trunk/iplb/MAINTAINER trunk/iplb/Makefile.cvs trunk/iplb/RPMNAME trunk/iplb/VERSION trunk/iplb/agents/ trunk/iplb/agents/.cvsignore trunk/iplb/agents/Makefile.am trunk/iplb/agents/iplb.scr trunk/iplb/configure.in.in trunk/iplb/doc/ trunk/iplb/doc/.cvsignore trunk/iplb/doc/Makefile trunk/iplb/doc/Makefile.am trunk/iplb/doc/Makefile.in trunk/iplb/doc/autodocs/ trunk/iplb/doc/autodocs/.cvsignore trunk/iplb/doc/autodocs/Makefile trunk/iplb/doc/autodocs/Makefile.am trunk/iplb/doc/autodocs/Makefile.in trunk/iplb/package/ trunk/iplb/package/.cvsignore trunk/iplb/package/yast2-iplb.changes trunk/iplb/series trunk/iplb/src/ trunk/iplb/src/.cvsignore trunk/iplb/src/Iplb.ycp trunk/iplb/src/Makefile.am trunk/iplb/src/common.ycp trunk/iplb/src/complex.ycp trunk/iplb/src/dialogs.ycp trunk/iplb/src/global_conf.ycp trunk/iplb/src/helps.ycp trunk/iplb/src/iplb.desktop trunk/iplb/src/iplb.ycp trunk/iplb/src/iplb_auto.ycp trunk/iplb/src/iplb_proposal.ycp trunk/iplb/src/vserver_conf.ycp trunk/iplb/src/wizards.ycp trunk/iplb/testsuite/ trunk/iplb/testsuite/.cvsignore trunk/iplb/testsuite/Makefile trunk/iplb/testsuite/Makefile.am trunk/iplb/testsuite/Makefile.in trunk/iplb/testsuite/tests/ trunk/iplb/testsuite/tests/.cvsignore trunk/iplb/testsuite/tests/Iplb.err trunk/iplb/testsuite/tests/Iplb.out trunk/iplb/testsuite/tests/Iplb.ycp trunk/iplb/vserver_conf.ycp trunk/iplb/yast2-iplb.spec.in Added: trunk/iplb/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/.cvsignore?rev=67509&view=a… ============================================================================== --- trunk/iplb/.cvsignore (added) +++ trunk/iplb/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +iplb.pot +autom4te.cache Added: trunk/iplb/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/MAINTAINER?rev=67509&view=a… ============================================================================== --- trunk/iplb/MAINTAINER (added) +++ trunk/iplb/MAINTAINER Wed Feb 22 11:55:23 2012 @@ -0,0 +1 @@ +dmzhang(a)suse.com Added: trunk/iplb/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/Makefile.cvs?rev=67509&view… ============================================================================== --- trunk/iplb/Makefile.cvs (added) +++ trunk/iplb/Makefile.cvs Wed Feb 22 11:55:23 2012 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/iplb/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/RPMNAME?rev=67509&view=auto ============================================================================== --- trunk/iplb/RPMNAME (added) +++ trunk/iplb/RPMNAME Wed Feb 22 11:55:23 2012 @@ -0,0 +1 @@ +yast2-iplb Added: trunk/iplb/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/VERSION?rev=67509&view=auto ============================================================================== --- trunk/iplb/VERSION (added) +++ trunk/iplb/VERSION Wed Feb 22 11:55:23 2012 @@ -0,0 +1 @@ +2.15.0 Added: trunk/iplb/agents/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/agents/.cvsignore?rev=67509… ============================================================================== --- trunk/iplb/agents/.cvsignore (added) +++ trunk/iplb/agents/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/iplb/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/agents/Makefile.am?rev=6750… ============================================================================== --- trunk/iplb/agents/Makefile.am (added) +++ trunk/iplb/agents/Makefile.am Wed Feb 22 11:55:23 2012 @@ -0,0 +1,8 @@ +# Makefile.am for iplb/agents + +agent_SCRIPTS = + +scrconf_DATA = \ + iplb.scr + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/iplb/agents/iplb.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/agents/iplb.scr?rev=67509&v… ============================================================================== --- trunk/iplb/agents/iplb.scr (added) +++ trunk/iplb/agents/iplb.scr Wed Feb 22 11:55:23 2012 @@ -0,0 +1,36 @@ +/** + * File: + * iplb.scr + * Summary: + * SCR Agent for reading/writing /etc/ha.d/ldirectord.cf using the ini-agent + * For the config file format, see "ldirectord --help". + */ + + +// FIXME: global params localted after section are recognized as section +// params, evne it's writen at the exact beginning of the line. + +.iplb + +`ag_ini( + `IniAgent( + "/etc/ha.d/ldirectord.cf", + $[ + "options" : ["global_values", "no_nested_sections", "repeat_names"], + "comments": ["^[ \t]*#.*", "#.*", "^[ \t]*$"], + "sections": [ + /*agent interface can not use different section form + * like "virtual=" and "virtual6=" are all sections. + * But when using SCR::Write, SCR::Write can not be specified + * to use which section form "virutal=" or "virtual6=",So use + * "virtual%s" to differ "virutal6=ipv6 address" and "virtual=ipv4 adress" + */ + $[ + "begin" : ["^[ \t]*virtual6{0,1}[ \t]*=[ \t]*(.+)[ \t]*$", "virtual%s"], + ], + ], + "params" : [$["match" : ["^[ \t]*([a-zA-Z0-9_]+)[ \t]*=[ \t]*(.+)[ \t]*$", "%s = %s"]]], + "subindent" : "\t" + ] + ) +) Added: trunk/iplb/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/configure.in.in?rev=67509&v… ============================================================================== --- trunk/iplb/configure.in.in (added) +++ trunk/iplb/configure.in.in Wed Feb 22 11:55:23 2012 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/iplb/doc/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/.cvsignore?rev=67509&vi… ============================================================================== --- trunk/iplb/doc/.cvsignore (added) +++ trunk/iplb/doc/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/iplb/doc/Makefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/Makefile?rev=67509&view… ============================================================================== --- trunk/iplb/doc/Makefile (added) +++ trunk/iplb/doc/Makefile Wed Feb 22 11:55:23 2012 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# doc/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# Makefile.am for iplb/doc + + +pkgdatadir = $(datadir)/yast2-iplb +pkglibdir = $(libdir)/yast2-iplb +pkgincludedir = $(includedir)/yast2-iplb +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-suse-linux-gnu +host_triplet = i686-suse-linux-gnu +target_triplet = i686-suse-linux-gnu +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)" +docDATA_INSTALL = $(INSTALL_DATA) +htmlDATA_INSTALL = $(INSTALL_DATA) +DATA = $(doc_DATA) $(html_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run aclocal-1.10 +AMTAR = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run tar +AUTOCONF = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run autoconf +AUTOHEADER = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run autoheader +AUTOMAKE = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run automake-1.10 +AWK = gawk +CYGPATH_W = echo +DEFS = -DPACKAGE_NAME=\"yast2-iplb\" -DPACKAGE_TARNAME=\"yast2-iplb\" -DPACKAGE_VERSION=\"2.15.0\" -DPACKAGE_STRING=\"yast2-iplb\ 2.15.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-iplb\" -DVERSION=\"2.15.0\" +ECHO_C = +ECHO_N = -n +ECHO_T = +INSTALL = /usr/bin/install -c -p +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +LIBOBJS = +LIBS = +LN_S = ln -s +LTLIBOBJS = +MAINTAINER = Cong Meng <cmeng(a)novell.com> +MAKEINFO = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run makeinfo +MKDIR_P = /bin/mkdir -p +PACKAGE = yast2-iplb +PACKAGE_BUGREPORT = http://bugs.opensuse.org/ +PACKAGE_NAME = yast2-iplb +PACKAGE_STRING = yast2-iplb 2.15.0 +PACKAGE_TARNAME = yast2-iplb +PACKAGE_VERSION = 2.15.0 +PATH_SEPARATOR = : +PKG_CONFIG_PATH = +RPMNAME = yast2-iplb +SET_MAKE = +SHELL = /bin/sh +STRIP = +STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css +STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl +STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl +STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl +STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl +VERSION = 2.15.0 +XGETTEXT = /usr/bin/xgettext +Y2DEVTOOLS_PREFIX = /usr +YCPC = /usr/bin/ycpc +YCPDOC = /usr/lib/YaST2/bin/ycpdoc +YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep +abs_builddir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/doc +abs_srcdir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/doc +abs_top_builddir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0 +abs_top_srcdir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0 +agentdir = ${prefix}/lib/YaST2/servers_non_y2 +am__leading_dot = . +am__tar = tar --format=ustar -chf - "$$tardir" +am__untar = tar -xf - +bindir = ${exec_prefix}/bin +build = i686-suse-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = suse +builddir = . +clientdir = ${prefix}/share/YaST2/clients +datadir = ${datarootdir} +datarootdir = ${prefix}/share +desktopdir = ${prefix}/share/applications/YaST2 +docdir = ${prefix}/share/doc/packages/yast2-iplb +dvidir = ${docdir} +exec_prefix = ${prefix} +execcompdir = ${prefix}/lib/YaST2 +fillupdir = /var/adm/fillup-templates +host = i686-suse-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = suse +htmldir = $(docdir) +imagedir = ${prefix}/share/YaST2/images +includedir = ${prefix}/include/YaST2 +infodir = ${datarootdir}/info +install_sh = $(SHELL) /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/install-sh +libdir = /usr/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${prefix}/share/YaST2/locale +localstatedir = ${prefix}/var +mandir = ${prefix}/share/man +mkdir_p = /bin/mkdir -p +moduledir = ${prefix}/share/YaST2/modules +oldincludedir = /usr/include +pdfdir = ${docdir} +pkgconfigdatadir = ${datadir}/pkgconfig +pkgconfigdir = ${libdir}/pkgconfig +plugindir = ${libdir}/YaST2/plugin +potdir = ${docdir}/pot +prefix = /usr +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +schemadir = ${prefix}/share/YaST2/schema +scrconfdir = ${prefix}/share/YaST2/scrconf +sharedstatedir = ${prefix}/com +srcdir = . +sysconfdir = ${prefix}/etc +target = i686-suse-linux-gnu +target_alias = +target_cpu = i686 +target_os = linux-gnu +target_vendor = suse +themedir = ${prefix}/share/YaST2/theme +top_build_prefix = ../ +top_builddir = .. +top_srcdir = .. +yast2dir = ${prefix}/share/YaST2 +ybindir = ${prefix}/lib/YaST2/bin +ydatadir = ${prefix}/share/YaST2/data +yncludedir = ${prefix}/share/YaST2/include +ystartupdir = ${prefix}/lib/YaST2 +SUBDIRS = autodocs +doc_DATA = +html_DATA = +EXTRA_DIST = $(doc_DATA) $(html_DATA) +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(html_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(htmldir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-docDATA install-htmlDATA + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-docDATA uninstall-htmlDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-docDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-htmlDATA install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-docDATA uninstall-htmlDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/iplb/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/Makefile.am?rev=67509&v… ============================================================================== --- trunk/iplb/doc/Makefile.am (added) +++ trunk/iplb/doc/Makefile.am Wed Feb 22 11:55:23 2012 @@ -0,0 +1,10 @@ +# Makefile.am for iplb/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: trunk/iplb/doc/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/Makefile.in?rev=67509&v… ============================================================================== --- trunk/iplb/doc/Makefile.in (added) +++ trunk/iplb/doc/Makefile.in Wed Feb 22 11:55:23 2012 @@ -0,0 +1,536 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Makefile.am for iplb/doc + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = doc +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)" +docDATA_INSTALL = $(INSTALL_DATA) +htmlDATA_INSTALL = $(INSTALL_DATA) +DATA = $(doc_DATA) $(html_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = $(docdir) +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +SUBDIRS = autodocs +doc_DATA = +html_DATA = +EXTRA_DIST = $(doc_DATA) $(html_DATA) +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-docDATA: $(doc_DATA) + @$(NORMAL_INSTALL) + test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" + @list='$(doc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \ + $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \ + done + +uninstall-docDATA: + @$(NORMAL_UNINSTALL) + @list='$(doc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \ + rm -f "$(DESTDIR)$(docdir)/$$f"; \ + done +install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(html_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(htmldir)/$$f"; \ + done + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile $(DATA) +installdirs: installdirs-recursive +installdirs-am: + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +info: info-recursive + +info-am: + +install-data-am: install-docDATA install-htmlDATA + +install-dvi: install-dvi-recursive + +install-exec-am: + +install-html: install-html-recursive + +install-info: install-info-recursive + +install-man: + +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: uninstall-docDATA uninstall-htmlDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic ctags \ + ctags-recursive distclean distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-docDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-htmlDATA install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-docDATA uninstall-htmlDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/iplb/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/autodocs/.cvsignore?rev… ============================================================================== --- trunk/iplb/doc/autodocs/.cvsignore (added) +++ trunk/iplb/doc/autodocs/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: trunk/iplb/doc/autodocs/Makefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/autodocs/Makefile?rev=6… ============================================================================== --- trunk/iplb/doc/autodocs/Makefile (added) +++ trunk/iplb/doc/autodocs/Makefile Wed Feb 22 11:55:23 2012 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# doc/autodocs/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# Makefile.am for iplb/doc/autodocs + +# -*- makefile -*- Automake include file +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ + +# Builds source documentation for YCP sources +# Uses ycpdoc +# PARAMETERS: +# AUTODOCS_YCP: Files that the ycp autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm + + +pkgdatadir = $(datadir)/yast2-iplb +pkglibdir = $(libdir)/yast2-iplb +pkgincludedir = $(includedir)/yast2-iplb +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-suse-linux-gnu +host_triplet = i686-suse-linux-gnu +target_triplet = i686-suse-linux-gnu +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/autodocs-ycp.ami +subdir = doc/autodocs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(htmldir)" +htmlDATA_INSTALL = $(INSTALL_DATA) +DATA = $(html_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run aclocal-1.10 +AMTAR = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run tar +AUTOCONF = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run autoconf +AUTOHEADER = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run autoheader +AUTOMAKE = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run automake-1.10 +AWK = gawk +CYGPATH_W = echo +DEFS = -DPACKAGE_NAME=\"yast2-iplb\" -DPACKAGE_TARNAME=\"yast2-iplb\" -DPACKAGE_VERSION=\"2.15.0\" -DPACKAGE_STRING=\"yast2-iplb\ 2.15.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-iplb\" -DVERSION=\"2.15.0\" +ECHO_C = +ECHO_N = -n +ECHO_T = +INSTALL = /usr/bin/install -c -p +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +LIBOBJS = +LIBS = +LN_S = ln -s +LTLIBOBJS = +MAINTAINER = Cong Meng <cmeng(a)novell.com> +MAKEINFO = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run makeinfo +MKDIR_P = /bin/mkdir -p +PACKAGE = yast2-iplb +PACKAGE_BUGREPORT = http://bugs.opensuse.org/ +PACKAGE_NAME = yast2-iplb +PACKAGE_STRING = yast2-iplb 2.15.0 +PACKAGE_TARNAME = yast2-iplb +PACKAGE_VERSION = 2.15.0 +PATH_SEPARATOR = : +PKG_CONFIG_PATH = +RPMNAME = yast2-iplb +SET_MAKE = +SHELL = /bin/sh +STRIP = +STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css +STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl +STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl +STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl +STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl +VERSION = 2.15.0 +XGETTEXT = /usr/bin/xgettext +Y2DEVTOOLS_PREFIX = /usr +YCPC = /usr/bin/ycpc +YCPDOC = /usr/lib/YaST2/bin/ycpdoc +YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep +abs_builddir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/doc/autodocs +abs_srcdir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/doc/autodocs +abs_top_builddir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0 +abs_top_srcdir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0 +agentdir = ${prefix}/lib/YaST2/servers_non_y2 +am__leading_dot = . +am__tar = tar --format=ustar -chf - "$$tardir" +am__untar = tar -xf - +bindir = ${exec_prefix}/bin +build = i686-suse-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = suse +builddir = . +clientdir = ${prefix}/share/YaST2/clients +datadir = ${datarootdir} +datarootdir = ${prefix}/share +desktopdir = ${prefix}/share/applications/YaST2 +docdir = ${prefix}/share/doc/packages/yast2-iplb +dvidir = ${docdir} +exec_prefix = ${prefix} +execcompdir = ${prefix}/lib/YaST2 +fillupdir = /var/adm/fillup-templates +host = i686-suse-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = suse +htmldir = $(docdir)/autodocs +imagedir = ${prefix}/share/YaST2/images +includedir = ${prefix}/include/YaST2 +infodir = ${datarootdir}/info +install_sh = $(SHELL) /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/install-sh +libdir = /usr/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${prefix}/share/YaST2/locale +localstatedir = ${prefix}/var +mandir = ${prefix}/share/man +mkdir_p = /bin/mkdir -p +moduledir = ${prefix}/share/YaST2/modules +oldincludedir = /usr/include +pdfdir = ${docdir} +pkgconfigdatadir = ${datadir}/pkgconfig +pkgconfigdir = ${libdir}/pkgconfig +plugindir = ${libdir}/YaST2/plugin +potdir = ${docdir}/pot +prefix = /usr +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +schemadir = ${prefix}/share/YaST2/schema +scrconfdir = ${prefix}/share/YaST2/scrconf +sharedstatedir = ${prefix}/com +srcdir = . +sysconfdir = ${prefix}/etc +target = i686-suse-linux-gnu +target_alias = +target_cpu = i686 +target_os = linux-gnu +target_vendor = suse +themedir = ${prefix}/share/YaST2/theme +top_build_prefix = ../../ +top_builddir = ../.. +top_srcdir = ../.. +yast2dir = ${prefix}/share/YaST2 +ybindir = ${prefix}/lib/YaST2/bin +ydatadir = ${prefix}/share/YaST2/data +yncludedir = ${prefix}/share/YaST2/include +ystartupdir = ${prefix}/lib/YaST2 +html_DATA = index.html $(wildcard *.html) +CLEANFILES = $(html_DATA) pod2htm*.tmp +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/autodocs/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/autodocs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(html_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(htmldir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-htmlDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-htmlDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-htmlDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-htmlDATA + + +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. $^ + for i in $(AUTODOCS_PM); do \ + b=`basename $$i`; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + done +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/iplb/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/autodocs/Makefile.am?re… ============================================================================== --- trunk/iplb/doc/autodocs/Makefile.am (added) +++ trunk/iplb/doc/autodocs/Makefile.am Wed Feb 22 11:55:23 2012 @@ -0,0 +1,3 @@ +# Makefile.am for iplb/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: trunk/iplb/doc/autodocs/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/doc/autodocs/Makefile.in?re… ============================================================================== --- trunk/iplb/doc/autodocs/Makefile.in (added) +++ trunk/iplb/doc/autodocs/Makefile.in Wed Feb 22 11:55:23 2012 @@ -0,0 +1,383 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Makefile.am for iplb/doc/autodocs + +# -*- makefile -*- Automake include file +# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ + +# Builds source documentation for YCP sources +# Uses ycpdoc +# PARAMETERS: +# AUTODOCS_YCP: Files that the ycp autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.ycp +# AUTODOCS_PM: Files that the perl autodocs is built from +# Optional - the default is $(srcdir)/../../src/*.pm + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/autodocs-ycp.ami +subdir = doc/autodocs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(htmldir)" +htmlDATA_INSTALL = $(INSTALL_DATA) +DATA = $(html_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = $(docdir)/autodocs +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +html_DATA = index.html $(wildcard *.html) +CLEANFILES = $(html_DATA) pod2htm*.tmp +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/autodocs-ycp.ami $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/autodocs/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu doc/autodocs/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-htmlDATA: $(html_DATA) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)" + @list='$(html_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + done + +uninstall-htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(html_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \ + rm -f "$(DESTDIR)$(htmldir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-htmlDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-htmlDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-htmlDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ + uninstall-am uninstall-htmlDATA + + +AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) +AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) + +index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) +#including *.pm, for the index + ${YCPDOC} -d. $^ + for i in $(AUTODOCS_PM); do \ + b=`basename $$i`; b=$${b%.pm}; \ + pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ + echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + done +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/iplb/package/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/package/.cvsignore?rev=6750… ============================================================================== --- trunk/iplb/package/.cvsignore (added) +++ trunk/iplb/package/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: trunk/iplb/package/yast2-iplb.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/package/yast2-iplb.changes?… ============================================================================== --- trunk/iplb/package/yast2-iplb.changes (added) +++ trunk/iplb/package/yast2-iplb.changes Wed Feb 22 11:55:23 2012 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Fri Dec 4 15:24:49 2009 - cmeng(a)novell.com + +- initial version Added: trunk/iplb/series URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/series?rev=67509&view=auto ============================================================================== --- trunk/iplb/series (added) +++ trunk/iplb/series Wed Feb 22 11:55:23 2012 @@ -0,0 +1,11 @@ +# Patch series file for quilt, created by quilt setup +# Source: yast2-iplb-2.15.0.tar.bz2 +# Patchdir: yast2-iplb-2.15.0 +# +move-to-ha-group.diff +rename-tabs.diff +add-quotes.diff +update-help.diff +598848-help-fix.diff +fix-ipv6-address.diff +checkIPfirst.patch Added: trunk/iplb/src/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/.cvsignore?rev=67509&vi… ============================================================================== --- trunk/iplb/src/.cvsignore (added) +++ trunk/iplb/src/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: trunk/iplb/src/Iplb.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/Iplb.ycp?rev=67509&view… ============================================================================== --- trunk/iplb/src/Iplb.ycp (added) +++ trunk/iplb/src/Iplb.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,446 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: modules/Iplb.ycp + * Package: Configuration of iplb + * Summary: Iplb settings, input and output functions + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: Iplb.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * + * Representation of the configuration of iplb. + * Input and output routines. + */ + +{ + +module "Iplb"; +textdomain "iplb"; + +import "Progress"; +import "Report"; +import "Summary"; +import "Message"; +import "IP"; + +// the global configure +global map<string, string> global_conf = $[]; +// the virtual servers configure +global map<string, map> vserver_conf = $[]; + + +/** + * Prototypes + */ +global boolean Modified(); + +/** + * Data was modified? + */ +boolean modified = false; + +/** + */ +boolean proposal_valid = false; + +/** + * Write only, used during autoinstallation. + * Don't run services and SuSEconfig, it's all done at one place. + */ +boolean write_only = false; + +/** + * Abort function + * return boolean return true if abort + */ +boolean() AbortFunction = Modified; + +/** + * Abort function + * @return boolean return true if abort + */ +global define boolean Abort() ``{ + if(AbortFunction != nil) + { + return AbortFunction () == true; + } + return false; +} + +/** + * Data was modified? + * @return true if modified + */ +global boolean Modified() { + y2debug("modified=%1",modified); + return modified; +} + +/** + * Mark as modified, for Autoyast. + */ +global void SetModified() { + modified = true; +} + +global boolean ProposalValid() { + return proposal_valid; +} + +global void SetProposalValid(boolean value) { + proposal_valid = value; +} + +/** + * @return true if module is marked as "write only" (don't start services etc...) + */ +global boolean WriteOnly() { + return write_only; +} + +/** + * Set write_only flag (for autoinstalation). + */ +global void SetWriteOnly(boolean value) { + write_only = value; +} + + +global void SetAbortFunction(boolean() function) { + AbortFunction = function; +} + + + +list<string> quote_list = [ + "callback", + "logfile", + "emailalert", + "execute", + "checkcommand", + "request", + "receive", + "virtualhost", + "login", + "passwd", + "database", + "secret" +]; + + +string remove_quote(string str) +{ + str = regexpsub(str, "^\"?(.*)", "\\1"); + if (regexpmatch(str, ".*\"$")) + str = regexpsub(str, "^(.*)\"$", "\\1"); + return str; +} + + +void remove_global_conf_quote() +{ + foreach (string key, string val, global_conf, { + if (contains(quote_list, key)) + global_conf[key] = remove_quote(global_conf[key]:""); + }); +} + + +void add_global_conf_quote() +{ + remove_global_conf_quote(); + foreach (string key, string val, global_conf, { + if (contains(quote_list, key)) + global_conf[key] = "\"" + global_conf[key]:"" + "\""; + }); +} + + +void remove_vserver_conf_quote() +{ + foreach (string key1, map val1, vserver_conf, { + foreach (string key2, list val2, (map<string, list>)val1, { + if (contains(quote_list, key2)) { + val2[0] = remove_quote(val2[0]:""); + vserver_conf[key1, key2] = val2; + }; + }); + }); +} + + +void add_vserver_conf_quote() +{ + remove_vserver_conf_quote(); + foreach (string key1, map val1, vserver_conf, { + foreach (string key2, list val2, (map<string, list>)val1, { + if (contains(quote_list, key2)) { + val2[0] = "\"" + val2[0]:"" + "\""; + vserver_conf[key1, key2] = val2; + }; + }); + }); +} + + +/** + * Read all iplb settings + * @return true on success + */ +global boolean Read() +{ + list<string> pair_names = []; + string caption = _("Initializing IPLB Configuration"); + + // Names of real stages + Progress::New(caption, " ", 3, + [ + _("Read the global settings"), + _("Read the virtual host settings") + ], + [ + _("Reading the global settings..."), + _("Reading the virtual host settings..."), + _("Finished") + ], + "" + ); + + ///////////////////////////////// + // read global configure + ///////////////////////////////// + // dir all global configure names + pair_names = SCR::Dir(.iplb.value); + + // read global configure values + global_conf = $[]; + foreach (string key, pair_names, { + list<string> vals = (list<string>) SCR::Read(.iplb.value + topath(key)); + global_conf[key] = vals[0]:""; + }); + + remove_global_conf_quote(); + + y2debug("___iplbdebug___ read global_conf = %1", global_conf); + Progress::NextStage(); + + + ///////////////////////////////// + // read vservers configure + ///////////////////////////////// + // dir all vserver names + list<string> vserver_names = SCR::Dir(.iplb.section); + + // iterate all vserver names + foreach (string vs_name, vserver_names, { + vserver_conf[vs_name] = $[]; + // vserver name contains ".", so quote it + path vs_name_path = topath("\"" + vs_name + "\""); + + // dir all pair name of given vserver name + pair_names = (list<string>) SCR::Dir(.iplb.value + vs_name_path); + // iterate pair names to read the pair value + foreach (string key, pair_names, { + vserver_conf[vs_name, key] = SCR::Read(.iplb.value + vs_name_path + topath(key)); + }); + //check for IPv6 address + boolean is_ipv6=false; + path sect_path=topath(""); + string ipv6_address=regexpsub(vs_name,"\\[(.+)\\]","\\1"); + if(ipv6_address!=nil) + is_ipv6=IP::Check6(ipv6_address); + if(is_ipv6){ + if(vserver_conf[vs_name,"real6"]:[] != []){ + vserver_conf[vs_name,"real"]=vserver_conf[vs_name,"real6"]:[]; + vserver_conf[vs_name,"real6"]=[]; + } + if(vserver_conf[vs_name,"fallback6"]:[] != []){ + vserver_conf[vs_name,"fallback"]=vserver_conf[vs_name,"fallback6"]:[]; + vserver_conf[vs_name,"fallback6"]=[]; + } + } + + }); + + remove_vserver_conf_quote(); + + y2debug("___iplbdebug___ read vserver_conf = %1", vserver_conf); + Progress::NextStage(); + + /* Progress finished */ + Progress::NextStage(); + + modified = false; + return true; +} + +/** + * Write all iplb settings + * @return true on success + */ +global boolean Write() +{ + boolean ret = false; + string caption = _("Saving IPLB Configuration"); + + Progress::New(caption, " ", 2, [ + _("Write the settings"), + _("Run SuSEconfig") + ], [ + _("Writing the settings..."), + _("Running SuSEconfig..."), + _("Finished") + ], + "" + ); + + // remove all sections, as ini agent will write new global conf + // entry at the end of the conf file. (global conf after sections + // will be read as vserver conf, not as global conf. it's a bug) + foreach(string key, map val, vserver_conf, { + path sect_path = topath("\"" + key + "\""); + ret = SCR::Write(.iplb.section + sect_path, nil); + }); + + map<string, string> saved_global_conf = global_conf; + add_global_conf_quote(); + + // write global conf + y2debug("___iplbdebug___ write global_conf=%1", global_conf); + foreach (string key, string val, global_conf, { + list write_val = nil; + if (val != nil) write_val = [val]; + ret = SCR::Write(.iplb.value + topath(key), write_val); + if (!ret) Report::Error (_("Cannot write settings.")); + }); + Progress::NextStage(); + + global_conf = saved_global_conf; + + + map<string, map> saved_vserver_conf = vserver_conf; + add_vserver_conf_quote(); + + // write vserver conf + y2debug("___iplbdebug___ write vserver_conf=%1", vserver_conf); + foreach(string key, map val, vserver_conf, { + /*check for ipv6 address to decide whether to add "6=" or "="*/ + /* string key's format + * 192.168.6.241:89 or [2001:db8::5]:119 + * only extract the 2001:db8::5 part from the key string + * to check whether it is an ipv6 address; + */ + boolean is_ipv6=false; + path sect_path=topath(""); + string ipv6_address=regexpsub(key,"\\[(.+)\\]","\\1"); + if(ipv6_address!=nil) + { + is_ipv6=IP::Check6(ipv6_address); + } + + if(is_ipv6){ + sect_path = topath("\"6 = " + key + "\""); + if(val["fallback"]:[] != []){ + val["fallback6"]=val["fallback"]:[]; + val["fallback"]=[]; + } + if(val["real"]:[] != []){ + val["real6"]=val["real"]:[]; + val["real"]=[]; + } + } + else + sect_path = topath("\" = " + key + "\""); + + if (val == nil) { + ret = SCR::Write(.iplb.section + sect_path, nil); + if (!ret) Report::Error(_("Cannot write settings.")); + continue; + } + + foreach(string key1, list val1, (map<string, list>)val, { + ret = SCR::Write(.iplb.value + sect_path + topath(key1), val1); + if (!ret) Report::Error(_("Cannot write settings.")); + }); + }); + Progress::NextStage(); + + vserver_conf = saved_vserver_conf; + + /* Progress finished */ + Progress::NextStage(); + + return true; +} + +/** + * Get all iplb settings from the first parameter + * (For use by autoinstallation.) + * @param settings The YCP structure to be imported. + * @return boolean True on success + */ +global boolean Import (map settings) { + // TODO FIXME: your code here (fill the above mentioned variables)... + return true; +} + +/** + * Dump the iplb settings to a single map + * (For use by autoinstallation.) + * @return map Dumped settings (later acceptable by Import ()) + */ +global map Export () { + // TODO FIXME: your code here (return the above mentioned variables)... + return $[]; +} + +/** + * Create a textual summary and a list of unconfigured cards + * @return summary of the current configuration + */ +global list Summary() { + // TODO FIXME: your code here... + /* Configuration summary text for autoyast */ + return [ _("Configuration summary..."), [] ]; +} + +/** + * Create an overview table with all configured cards + * @return table items + */ +global list Overview() { + // TODO FIXME: your code here... + return []; +} + +/** + * Return packages needed to be installed and removed during + * Autoinstallation to insure module has all needed software + * installed. + * @return map with 2 lists. + */ +global map AutoPackages() { + // TODO FIXME: your code here... + return $[ "install":[], "remove":[] ]; +} + +/* EOF */ +} Added: trunk/iplb/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/Makefile.am?rev=67509&v… ============================================================================== --- trunk/iplb/src/Makefile.am (added) +++ trunk/iplb/src/Makefile.am Wed Feb 22 11:55:23 2012 @@ -0,0 +1,32 @@ +# Makefile.am for iplb/src + +yncludedir = @yncludedir@/iplb + +client_DATA = \ + iplb.ycp \ + iplb_auto.ycp \ + iplb_proposal.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + common.ycp \ + global_conf.ycp \ + vserver_conf.ycp \ + complex.ycp + +desktop_DATA = \ + iplb.desktop + +module_DATA = \ + Iplb.ycp + +# create a symlink for local build, #145327 +iplb: + ln -sf . $@ +ycpchook = iplb + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/iplb/src/common.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/common.ycp?rev=67509&vi… ============================================================================== --- trunk/iplb/src/common.ycp (added) +++ trunk/iplb/src/common.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,51 @@ +{ + +textdomain "iplb"; + +import "Label"; +import "Wizard"; +import "Iplb"; +import "Popup"; +import "CWM"; + +list<string> DIALOG = [ + "global_conf", + "vserver_conf" +]; + +map NAME = $[ + "global_conf": _("Global Configuration"), + "vserver_conf": _("Virtual Servers Configuration") +]; + +any my_SetContents(string conf, term contents) +{ + Wizard::SetContents("IPLB - " + NAME[conf]:"", + contents, HELPS[conf]:"", true, true); + + if (UI::WidgetExists(`id(`wizardTree))) + UI::SetFocus(`id(`wizardTree)); + + return true; +} + +void myHelp(string help) +{ + UI::OpenDialog( `opt(`decorated ), + `HBox( `VSpacing(16), + `VBox( + `HSpacing(60), + `VSpacing(0.5), + `RichText(HELPS[help]:""), + `VSpacing(1.5), + `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()) + ) + ) + ); + + UI::SetFocus(`id(`ok)); + UI::UserInput(); + UI::CloseDialog(); +} + +} Added: trunk/iplb/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/complex.ycp?rev=67509&v… ============================================================================== --- trunk/iplb/src/complex.ycp (added) +++ trunk/iplb/src/complex.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,209 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/iplb/complex.ycp + * Package: Configuration of iplb + * Summary: Dialogs definitions + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: complex.ycp 41350 2007-10-10 16:59:00Z dfiser $ + */ + +{ + +textdomain "iplb"; + +import "Label"; +import "Popup"; +import "Wizard"; +import "Wizard_hw"; +import "Confirm"; +import "Iplb"; + + +include "iplb/helps.ycp"; + +/** + * Return a modification status + * @return true if data was modified + */ +boolean Modified() { + return Iplb::Modified(); +} + +boolean ReallyAbort() { + return !Iplb::Modified() || Popup::ReallyAbort(true); +} + +boolean PollAbort() { + return UI::PollInput() == `abort; +} + +/** + * Read settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); + // Iplb::SetAbortFunction(PollAbort); + if (!Confirm::MustBeRoot()) return `abort; + boolean ret = Iplb::Read(); + return ret ? `next : `abort; +} + +/** + * Write settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol WriteDialog() { + Wizard::RestoreHelp(HELPS["write"]:""); + // Iplb::SetAbortFunction(PollAbort); + boolean ret = Iplb::Write(); + return ret ? `next : `abort; +} + +/** + * Summary dialog + * @return dialog result + */ +any SummaryDialog() { + + /* Iplb summary dialog caption */ + string caption = _("IPLB Configuration"); + + /* FIXME */ + list summary = Iplb::Summary(); + list unconfigured = summary[1]:[]; + string configured = summary[0]:""; + + /* Frame label */ + term contents = Wizard_hw::DetectedContent(_("IPLB to Configure"), + unconfigured, false, configured); + + Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", + Label::BackButton(), Label::FinishButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel || ret == `back) { + if(ReallyAbort()) break; + else continue; + } + /* overview dialog */ + else if(ret == `edit_button) { + ret = `overview; + break; + } + /* configure the selected device */ + else if(ret == `configure_button) { + // TODO FIXME: check for change of the configuration + any selected = UI::QueryWidget(`id(`detected_selbox), `CurrentItem); + if(selected == `other) { + ret = `other; + } + else { + ret = `configure; + } + break; + } + else if(ret == `next) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/** + * Overview dialog + * @return dialog result + */ +any OverviewDialog() { + + /* Iplb overview dialog caption */ + string caption = _("IPLB Overview"); + + list overview = Iplb::Overview(); + + /* FIXME table header */ + term contents = Wizard_hw::ConfiguredContent( + /* Table header */ + `header(_("Number"), _("IPLB")), + overview, nil, nil, nil, nil ); + + contents = Wizard_hw::SpacingAround(contents, 1.5, 1.5, 1.0, 1.0); + +// Wizard::SetContents("Cluster, contents", "help", true, true); + + Wizard::SetContentsButtons(caption, contents, HELPS["overview"]:"", + Label::BackButton(), Label::FinishButton()); + + Wizard::HideBackButton(); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + /* add */ + else if(ret == `add_button) { + /* FIXME */ + ret = `add; + break; + } + /* edit */ + else if(ret == `edit_button) { + /* FIXME */ + ret = `edit; + break; + } + /* delete */ + else if(ret == `delete_button) { + /* FIXME */ + continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/* EOF */ +} Added: trunk/iplb/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/dialogs.ycp?rev=67509&v… ============================================================================== --- trunk/iplb/src/dialogs.ycp (added) +++ trunk/iplb/src/dialogs.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,115 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/iplb/dialogs.ycp + * Package: Configuration of iplb + * Summary: Dialogs definitions + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: dialogs.ycp 27914 2006-02-13 14:32:08Z locilka $ + */ + +{ + +textdomain "iplb"; + +import "Label"; +import "Wizard"; +import "Iplb"; + +include "iplb/helps.ycp"; + +/** + * Configure1 dialog + * @return dialog result + */ +any Configure1Dialog () { + + /* Iplb configure1 dialog caption */ + string caption = _("IPLB Configuration"); + + /* Iplb configure1 dialog contents */ + term contents = `Label (_("First part of configuration of IPLB")); + + Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/** + * Configure2 dialog + * @return dialog result + */ +any Configure2Dialog () { + + /* Iplb configure2 dialog caption */ + string caption = _("IPLB Configuration"); + + /* Iplb configure2 dialog contents */ + term contents = `Label (_("Second part of configuration of IPLB")); + + Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", + Label::BackButton(), Label::NextButton()); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + + /* abort? */ + if(ret == `abort || ret == `cancel) { + if(ReallyAbort()) break; + else continue; + } + else if(ret == `next || ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + return ret; +} + +/* EOF */ +} Added: trunk/iplb/src/global_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/global_conf.ycp?rev=675… ============================================================================== --- trunk/iplb/src/global_conf.ycp (added) +++ trunk/iplb/src/global_conf.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,141 @@ +{ +textdomain "iplb"; +import "Label"; +import "Wizard"; +import "Iplb"; + +include "iplb/helps.ycp"; +include "iplb/common.ycp"; + + +// ids of widget of global dialog +list<symbol> global_entries = [ + `checkinterval, + `checktimeout, + `failurecount, + `negotiatetimeout, + `fallback, + `logfile, + `emailalert, + `emailalertfreq, + `emailalertstatus, + `callback, + `execute, + `autoreload, + `quiescent, + `fork, + `supervised +]; + +list yesno = [ + "", + "yes", + "no" +]; + +term global_layout() +{ + return + `VBox( + `DumbTab( + [ + `item(`id(`global_tab), "&Global Configuration", true), + `item(`id(`vserver_tab), "&Virtual Server Configuration") + ], + `VBox( + `VSpacing(1), + `HBox( + `TextEntry(`id(`checkinterval), _("Check Interval"), ""), + `TextEntry(`id(`checktimeout), _("Check Timeout"), ""), + `TextEntry(`id(`failurecount), _("Failure Count"), ""), + `TextEntry(`id(`negotiatetimeout), _("Negotiate Timeout"), "") + ), + `VSpacing(0.3), + `TextEntry(`id(`fallback), _("Fallback"), ""), + `TextEntry(`id(`logfile), _("Log File"), ""), + `VSpacing(), + `HBox( + `TextEntry(`id(`emailalert), _("Email Alert"), ""), + `TextEntry(`id(`emailalertfreq), _("Email Alert Freq"), ""), + `TextEntry(`id(`emailalertstatus), _("Email Alert Status"), "") + ), + `VSpacing(), + `HBox( + `TextEntry(`id(`callback), _("Callback"), ""), + `TextEntry(`id(`execute), _("Execute"), "") + ), + `VSpacing(), + `HBox( + `HSpacing(0.7), + `ComboBox(`id(`autoreload), _("Auto Reload"), yesno), + `ComboBox(`id(`quiescent), _("Quiescent"), yesno), + `ComboBox(`id(`fork), _("Fork"), yesno), + `ComboBox(`id(`supervised), _("Supervised"), yesno), + `HStretch() + ), + `VStretch() + ) + ) + ); +} + + +// fill the widgets accord to the Iplb::global_conf +void fill_global_entries() +{ + map l_global_conf = Iplb::global_conf; + + foreach(symbol key, global_entries, { + string name = substring(tostring(key), 1); // remove '`' char + string val = l_global_conf[name]:""; + if (size(val) > 0) + UI::ChangeWidget(key, `Value, val); + }); +} + + +// retrieve the value from widgets, save to Iplb::global_conf +void retrieve_global_entries() +{ + map l_global_conf = Iplb::global_conf; + + foreach(symbol key, global_entries, { + string name = substring(tostring(key), 1); // remove '`' char + string val_old = l_global_conf[name]:""; + string val_new = (string)UI::QueryWidget(key, `Value); + if (size(val_new) > 0) + l_global_conf[name] = val_new; + else if (size(val_old) > 0) + // assigning nil to remove it from conf file + l_global_conf[name] = nil; + }); + + Iplb::global_conf = (map<string, string>)l_global_conf; +} + + +// the entry to golbal configure stuff +// return `ok, `cancel or `vserver_tab +any global_dialog() +{ + any ret = nil; + + my_SetContents("global_conf", global_layout()); + fill_global_entries(); + + while(true) { + ret = UI::UserInput(); + + if (ret == `help) myHelp("global_conf"); + + if (ret == `cancel && ReallyAbort()) break; + + if (ret == `ok || ret == `vserver_tab) break; + } + + retrieve_global_entries(); + return ret; +} + +// EOF +} Added: trunk/iplb/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/helps.ycp?rev=67509&vie… ============================================================================== --- trunk/iplb/src/helps.ycp (added) +++ trunk/iplb/src/helps.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,355 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/iplb/helps.ycp + * Package: Configuration of iplb + * Summary: Help texts of all the dialogs + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: helps.ycp 27914 2006-02-13 14:32:08Z locilka $ + */ + +{ + +textdomain "iplb"; + +/** + * All helps are here + */ +map HELPS = $[ + "global_conf" : _(" +<big>check interval</big> = n +Defines the number of second between server checks. +Default: 10 seconds + +<big>check timeout</big> = n +Timeout in seconds for connect, external and ping checks. If the timeout is exceeded then the real server is declared dead. +If defined in a virtual server section then the global value is overridden. +If undefined then the value of negotiatetimeout is used. negotiatetimeout is also a global value that may be overriden by a per-virtual setting. +If both checktimeout and negotiatetimeout are unset, the default is used. +Default: 5 seconds + +<big>failure count</big> = n +The number of consecutive times a failure will have to be reported by a check before the realserver is considered to have failed. A value of 1 will have the realserver considered failed on the first failure. A successful check will reset the failure counter to 0. +If defined in a virtual server section then the global value is overridden. +Default: 1 + +<big>negotiate timeout</big> = n +Timeout in seconds for negotiate checks. +If defined in a virtual server section then the global value is overridden. +If undefined then the value of connecttimeout is used. connecttimeout is also a global value that may be overriden by a per-virtual setting. +If both negotiatetimeout and connecttimeout are unset, the default is used. +Default: 30 seconds + +<big>fallback</big> = ip_address|hostname[:portnumber|sercvicename] [gate|masq|ipip] +the server onto which a webservice is redirected if all real servers are down. Typically this would be 127.0.0.1 with an emergency page. +If defined in a virtual server section then the global value is overridden. + +<big>log file</big> = \"/path/to/logfile\"|syslog_facility +An alternative logfile might be specified with this directive. If the logfile does not have a leading '/', it is assumed to be a <a href=\"/man/3/syslog\">syslog</a>(3) facility name. +Default: log directly to the file /var/log/ldirectord.log. + +<big>email alert</big> = \"emailaddress\" +A valid email address for sending alerts about the changed connection status to any real server defined in the virtual service. This option requires perl +module MailTools to be installed. Automatically tries to send email using any of the built-in methods. See perldoc Mail::Mailer for more info on methods. +If defined in a virtual server section then the global value is overridden. + +<big>email alert freq</big> = n +Delay in seconds between repeating email alerts while any given real server in the virtual service remains inaccessible. A setting of zero seconds will +inhibit the repeating alerts. The email timing accuracy of this setting is dependent on the number of seconds defined in the checkinterval configuration +option. +If defined in a virtual server section then the global value is overridden. +Default: 0 + +<big>email alert status</big> = all|none|starting|running|stopping|reloading,... +Comma delimited list of server states in which email alerts should be sent. all is a short-hand for +\"starting,running,stopping,reloading\". If none is specified, no other option may be specified, otherwise options are ored +with each other. +If defined in a virtual server section then the global value is overridden. +Default: all + +<big>callback</big> = \"/path/to/callback\" +If this directive is defined, ldirectord automatically calls the executable /path/to/callback after the configuration file has changed on +disk. This is useful to update the configuration file through scp on the other heartbeated host. The first argument to the callback is the name of the +configuration. +This directive might also be used to restart ldirectord automatically after the configuration file changed on disk. However, if autoreload is +set to yes, the configuration is reloaded anyway. + +<big>execute</big> = \"configuration\" +Use this directive to start an instance of ldirectord for the named configuration. + +<big>auto reload</big> = yes|no +Defines if <ldirectord> should continuously check the configuration file for modification. If this is set to 'yes' and the configuration file changed +on disk and its modification time (mtime) is newer than the previous version, the configuration is automatically reloaded. +Default: no + +<big>quiescent</big> = yes|no +If yes, then when real or failback servers are determined to be down, they are not actually removed from the kernel's LVS table. +Rather, their weight is set to zero which means that no new connections will be accepted. +This has the side effect, that if the real server has persistent connections, new connections from any existing clients will continue to be routed to the +real server, until the persistant timeout can expire. See ipvsadm for more information on persistant connections. +This side-effect can be avoided by running the following: +echo 1 > /proc/sys/net/ipv4/vs/expire_quiescent_template +If the proc file isn't present this probably means that the kernel doesn't have lvs support, LVS support isn't loaded, or the kernel is too +old to have the proc file. Running ipvsadm as root should load LVS into the kernel if it is possible. +If no, then the real or failback servers will be removed from the kernel's LVS table. The default is yes. +If defined in a virtual server section then the global value is overridden. +Default: yes + +<big>fork</big> = yes|no +If yes, then ldirectord will spawn a child proccess for every virtual server, and run checks against the real servers from them. This will increase +response times to changes in real server status in configurations with many virtual servers. This may also use less memory then running many seperate instances +of ldirectord. Child processes will be automaticly restarted if they die. +Default: no + +<big>supervised</big> = yes|no +If yes, then ldirectord does not go into background mode. All log-messages are redirected to stdout instead of a logfile. This is useful to run +ldirectord supervised from daemontools. See <a href=\"http://untroubled.org/rpms/daemontools/\">http://untroubled.org/rpms/daemontools/</a> or <a href=\"http://cr.yp.to/daemontools.html\">http://cr.yp.to/daemontools.html</a> for details. +Default: no + +"), + + + + + + "vserver_conf" : _(" +<big>virtual server</big> = (ip_address|hostname:portnumber|servicename)|firewall-mark +Defines a virtual service by IP-address (or hostname) and port (or servicename) or firewall-mark. A firewall-mark is an integer greater than zero. The +configuration of marking packets is controled using the <tt>\"-m\"</tt> option to ipchains(8). All real services and flags for a virtual service +must follow this line immediately and be indented. + + +<big>real servers</big> = ip_address|hostname[->ip_address|hostname][:portnumber|servicename] +gate|masq|ipip [weight] [\"request\", \"receive\"] +Defines a real service by IP-address (or hostname) and port (or servicename). If the port is omitted then a 0 will be used, this is intended primarily for +fwmark services where the port for real servers is ignored. Optionally a range of IP addresses (or two hostnames) may be given, in which case +each IP address in the range will be treated as a real server using the given port. The second argument defines the forwarding method, must be +gate, ipip or masq. The thrid argument is optional and defines the weight for that real server. If omitted then a weight of 1 will be +used. The last two arguments are also optional. They define a request-receive pair to be used to check if a server is alive. They override the request-receive +pair in the virtual server section. These two strings must be quoted. If the request string starts with http://... the IP-address and port of the real +server is overridden, otherwise the IP-address and port of the real server is used. +For TCP and UDP (non fwmark) virtual services, unless the forwarding method is masq and the IP address of a +real server is non-local (not present on a interface on the host running ldirectord) then the port of the real server will be set to that of its virtual +service. That is, port-mapping is only available to if the real server is another machine and the forwarding method is masq. This is due to the way that the +underlying LVS code in the kernel functions. +More than one of these entries may be inside a virtual section. The checktimeout, negotiatetimeout, failurecount, fallback, emailalert, emailalertfreq and +quiescent options listed above may also appear inside a virtual section, in which case the global setting is overridden. + + +<big>check type</big> = connect|external|negotiate|off|on|ping|checktimeoutN +Type of check to perform. Negotiate sends a request and matches a receive string. Connect only attemts to make a TCP/IP connection, thus the +request and receive strings may be omitted. If checktype is a number then negotiate and connect is combined so that after each N connect attempts one negotiate +attempt is performed. This is useful to check often if a service answers and in much longer intervalls a negotiating check is done. Ping means that +ICMP ping will be used to test the availability of real servers. Ping is also used as the connect check for UDP services. Off +means no checking will take place and no real or fallback servers will be activated. On means no checking will take place and real servers will always be +activated. Default is negotiate. + + +<big>service</big> = dns|ftp|http|https|imap|imaps|ldap|mysql|nntp|none|oracle|pgsql|pop|pops|radius|simpletcp|sip|smtp +The type of service to monitor when using checktype=negotiate. None denotes a service that will not be monitored. +simpletcp sends the request string to the server and tests it against the receive regexp. The other types of checks connect to the server +using the specified protocol. Please see the request and receive sections for protocol specific information. +Default: +<dl compact=\"compact\"> +<dt>* Virtual server port is 21: ftp +</dt><dt>* Virtual server port is 25: smtp +</dt><dt>* Virtual server port is 53: dns +</dt><dt>* Virtual server port is 80: http +</dt><dt>* Virtual server port is 110: pop +</dt><dt>* Virtual server port is 119: nntp +</dt><dt>* Virtual server port is 143: imap +</dt><dt>* Virtual server port is 389: ldap +</dt><dt>* Virtual server port is 443: https +</dt><dt>* Virtual server port is 993: imaps +</dt><dt>* Virtual server port is 995: pops +</dt><dt>* Virtual server port is 1521: oracle +</dt><dt>* Virtual server port is 1812: radius +</dt><dt>* Virtual server port is 3306: mysql +</dt><dt>* Virtual server port is 5432: pgsql +</dt><dt>* Virtual server port is 5060: sip +</dt><dt>* Otherwise: none + + +</dt><dt><big>check command</big> = \"path to script\" +This setting is used if checktype is external and is the command to be run to check the status of a real server. It should exit with status 0 if everything +is ok, or non-zero otherwise. +Four parameters are passed to the script: +</dt><dt>* virtual server ip/firewall mark +</dt><dt>* virtual server port +</dt><dt>* real server ip +</dt><dt>* real server port +</dt><dt>Default: /bin/true + + +<big>check port</big> = n +Number of port to monitor. Sometimes check port differs from service port. +Default: port specified for each real server + + +<big>request</big> = \"uri to requested object\" +This object will be requested each checkinterval seconds on each real server. The string must be inside quotes. Note that this string may be overridden by +an optional per real-server based request-string. +For a DNS check this should the name of an A record, or the address of a PTR record to look up. +For a MySQL, Oracle or PostgeSQL check, this should be an SQL query. The data returned is not checked, only that the answer is one or more +rows. This is a required setting. +For a simpletcp check, this string is sent verbatim except any occurances of \n are replaced with a new line character. + + +<big>receive</big> = \"regexp to compare\" +If the requested result contains this regexp to compare, the real server is declared alive. The regexp must be inside quotes. Keep in mind that +regexps are not plain strings and that you need to escape the special characters if they should as literals. Note that this regexp may be overridden by an +optional per real-server based receive regexp. +For a DNS check this should be any one the A record's addresses or any one of the PTR record's names. +For a MySQL check, the receive setting is not used. + + +<big>http method</big> = GET | HEAD +Sets the HTTP method which should be used to fetch the URI specified in the request-string. GET is the +method used by default if the parameter is not set. If HEAD is used, the receive-string should be unset. +Default: GET + + +<big>virtual host</big> = \"hostname\" +Used when using a negotiate check with HTTP or HTTPS . Sets the host header used in the HTTP request. In the +case of HTTPS this generally needs to match the common name of the SSL certificate. If not set then the host header will be +derived from the request url for the real server if present. As a last resort the IP address of the real server will be used. + + +<big>login</big> = \"username\" +For FTP , IMAP , LDAP , MySQL, Oracle, POP and PostgreSQL, the username used to log in. +For Radius the passwd is used for the attribute User-Name. +For SIP , the username is used as both the to and from address for an OPTIONS query. +Default: +</dt><dt>* FTP: Anonymous +</dt><dt>* MySQL Oracle, and PostgreSQL: Must be specified in the configuration +</dt><dt>* SIP: ldirectord\@<hostname>, hostname is derived as per the passwd option below. +</dt><dt>* Otherwise: empty string, which denotes that case authentication will not be attempted. + + +</dt><dt><big>password</big> = \"password\" +Password to use to login to FTP , IMAP , LDAP , MySQL, Oracle, POP , PostgreSQL and +SIP servers. +For Radius the passwd is used for the attribute User-Password. +Default: +</dt><dt>* FTP: ldirectord\@<hostname>, where hostname is the environment variable HOSTNAME evaluated at run time, or sourced +from uname if unset. +</dt><dt>* Otherwise: empty string. In the case of LDAP , MySQL, Oracle, and PostgreSQL this means that authentication will not be performed. + + +</dt><dt><big>database name</big> = \"databasename\" +Database to use for MySQL, Oracle and PostgreSQL servers, this is the database that the query (set by receive above) will be performed against. This +is a required setting. + + +<big>radius secret</big> = \"radiussecret\" +Secret to use for Radius servers, this is the secret used to perform an Access-Request with the username (set by login above) and passwd (set by +passwd above). +Default: empty string + + +<big>persistent</big> = n +Number of seconds for persistent client connections. + + +<big>netmask</big> = w.x.y.z +Netmask to be used for granularity of persistent client connections. + + +<big>scheduler</big> = scheduler_name +Scheduler to be used by LVS for loadbalancing. For an information on the available sehedulers please see the <a href=\"ipvsadm\">ipvsadm</a>(8) man page. +Default: \"wrr\" + + +<big>protocol</big> = tcp|udp|fwm +Protocol to be used. If the virtual is specified as an IP address and port then it must be one of tcp or udp. If a firewall mark then the +protocol must be fwm. +Default: +</dt><dt>* Virtual is an IP address and port, and the port is not 53: tcp +</dt><dt>* Virtual is an IP address and port, and the port is 53: udp +</dt><dt>* Virtual is a firewall mark: fwm +</dt></dl> + + +<big>check timeout</big> = n +Timeout in seconds for connect, external and ping checks. If the timeout is exceeded then the real server is declared dead. +If defined in a virtual server section then the global value is overridden. +If undefined then the value of negotiatetimeout is used. negotiatetimeout is also a global value that may be overriden by a per-virtual setting. +If both checktimeout and negotiatetimeout are unset, the default is used. +Default: 5 seconds + +<big>negotiate timeout</big> = n +Timeout in seconds for negotiate checks. +If defined in a virtual server section then the global value is overridden. +If undefined then the value of connecttimeout is used. connecttimeout is also a global value that may be overriden by a per-virtual setting. +If both negotiatetimeout and connecttimeout are unset, the default is used. +Default: 30 seconds + +<big>failure count</big> = n +The number of consecutive times a failure will have to be reported by a check before the realserver is considered to have failed. A value of 1 will have the realserver considered failed on the first failure. A successful check will reset the failure counter to 0. +If defined in a virtual server section then the global value is overridden. +Default: 1 + +<big>email alert</big> = \"emailaddress\" +A valid email address for sending alerts about the changed connection status to any real server defined in the virtual service. This option requires perl +module MailTools to be installed. Automatically tries to send email using any of the built-in methods. See perldoc Mail::Mailer for more info on methods. +If defined in a virtual server section then the global value is overridden. + +<big>email alert freq</big> = n +Delay in seconds between repeating email alerts while any given real server in the virtual service remains inaccessible. A setting of zero seconds will +inhibit the repeating alerts. The email timing accuracy of this setting is dependent on the number of seconds defined in the checkinterval configuration +option. +If defined in a virtual server section then the global value is overridden. +Default: 0 + +<big>email alert status</big> = all|none|starting|running|stopping|reloading,... +Comma delimited list of server states in which email alerts should be sent. all is a short-hand for +\"starting,running,stopping,reloading\". If none is specified, no other option may be specified, otherwise options are ored +with each other. +If defined in a virtual server section then the global value is overridden. +Default: all + +<big>fallback</big> = ip_address|hostname[:portnumber|sercvicename] [gate|masq|ipip] +the server onto which a webservice is redirected if all real servers are down. Typically this would be 127.0.0.1 with an emergency page. +If defined in a virtual server section then the global value is overridden. + +<big>quiescent</big> = yes|no +If yes, then when real or failback servers are determined to be down, they are not actually removed from the kernel's LVS table. +Rather, their weight is set to zero which means that no new connections will be accepted. +This has the side effect, that if the real server has persistent connections, new connections from any existing clients will continue to be routed to the +real server, until the persistant timeout can expire. See ipvsadm for more information on persistant connections. +This side-effect can be avoided by running the following: +echo 1 > /proc/sys/net/ipv4/vs/expire_quiescent_template +If the proc file isn't present this probably means that the kernel doesn't have lvs support, LVS support isn't loaded, or the kernel is too +old to have the proc file. Running ipvsadm as root should load LVS into the kernel if it is possible. +If no, then the real or failback servers will be removed from the kernel's LVS table. The default is yes. +If defined in a virtual server section then the global value is overridden. +Default: yes + + + +"), + + +]; + +/* EOF */ +} Added: trunk/iplb/src/iplb.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/iplb.desktop?rev=67509&… ============================================================================== --- trunk/iplb/src/iplb.desktop (added) +++ trunk/iplb/src/iplb.desktop Wed Feb 22 11:55:23 2012 @@ -0,0 +1,25 @@ +[Desktop Entry] +Type=Application +Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-High_Availability; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=iplb + +X-SuSE-YaST-Group=High_Availability +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst= +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=iplb + +Icon=yast-iplb +Exec=/sbin/yast2 iplb + +Name=IPLB +GenericName=Configure IPLB(IP Load Balancing) +X-KDE-SubstituteUID=true +StartupNotify=true Added: trunk/iplb/src/iplb.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/iplb.ycp?rev=67509&view… ============================================================================== --- trunk/iplb/src/iplb.ycp (added) +++ trunk/iplb/src/iplb.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,93 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/iplb.ycp + * Package: Configuration of iplb + * Summary: Main file + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: iplb.ycp 27914 2006-02-13 14:32:08Z locilka $ + * + * Main file for iplb configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of iplb</h3> + */ + +textdomain "iplb"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("IPLB module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; +include "iplb/wizards.ycp"; + +map cmdline_description = $[ + "id" : "iplb", + /* Command line help text for the Xiplb module */ + "help" : _("Configuration of IPLB"), + "guihandler" : IplbSequence, + "initialize" : Iplb::Read, + "finish" : Iplb::Write, + "actions" : $[ + // FIXME TODO: fill the functionality description here + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], + "mappings" : $[ + // FIXME TODO: fill the mappings of actions and options here + ] +]; + +/* is this proposal or not? */ +boolean propose = false; +list args = WFM::Args(); +if(size(args) > 0) { + if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { + y2milestone("Using PROPOSE mode"); + propose = true; + } +} + +/* main ui function */ +any ret = nil; + +if(propose) ret = IplbAutoSequence(); +else ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("IPLB module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: trunk/iplb/src/iplb_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/iplb_auto.ycp?rev=67509… ============================================================================== --- trunk/iplb/src/iplb_auto.ycp (added) +++ trunk/iplb/src/iplb_auto.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,134 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/iplb_auto.ycp + * Package: Configuration of iplb + * Summary: Client for autoinstallation + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: iplb_auto.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * + * This is a client for autoinstallation. It takes its arguments, + * goes through the configuration and return the setting. + * Does not do any changes to the configuration. + */ + +/** + * @param function to execute + * @param map/list of iplb settings + * @return map edited settings, Summary or boolean on success depending on called function + * @example map mm = $[ "FAIL_DELAY" : "77" ]; + * @example map ret = WFM::CallFunction ("iplb_auto", [ "Summary", mm ]); + */ + +{ + +textdomain "iplb"; + +y2milestone("----------------------------------------"); +y2milestone("IPLB auto started"); + +import "Iplb"; +include "iplb/wizards.ycp"; + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map) WFM::Args(1); +} +y2debug("func=%1", func); +y2debug("param=%1", param); + +/* Create a summary*/ +if(func == "Summary") { + ret = select(Iplb::Summary(), 0, ""); +} +/* Reset configuration */ +else if (func == "Reset") { + Iplb::Import($[]); + ret = $[]; +} +/* Change configuration (run AutoSequence) */ +else if (func == "Change") { + ret = IplbAutoSequence(); +} +/* Import configuration */ +else if (func == "Import") { + ret = Iplb::Import(param); +} +/* Return actual state */ +else if (func == "Export") { + ret = Iplb::Export(); +} +/* Return needed packages */ +else if (func == "Packages") { + ret = Iplb::AutoPackages(); +} +/* Read current state */ +else if (func == "Read") { + import "Progress"; + boolean progress_orig = Progress::set (false); + ret = Iplb::Read(); + Progress::set (progress_orig); +} +/* Write givven settings */ +else if (func == "Write") { + import "Progress"; + boolean progress_orig = Progress::set (false); + Iplb::SetWriteOnly (true); + ret = Iplb::Write(); + Progress::set (progress_orig); +} +/** + * did configuration changed + * return boolean + */ +else if (func == "GetModified") { + ret = Iplb::Modified (); +} +/** + * set configuration as changed + * return boolean + */ +else if (func == "SetModified") { + Iplb::SetModified (true); + ret = true; +} + +/* Unknown function */ +else { + y2error("Unknown function: %1", func); + ret = false; +} + +y2debug("ret=%1", ret); +y2milestone("IPLB auto finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: trunk/iplb/src/iplb_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/iplb_proposal.ycp?rev=6… ============================================================================== --- trunk/iplb/src/iplb_proposal.ycp (added) +++ trunk/iplb/src/iplb_proposal.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,107 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: clients/iplb_proposal.ycp + * Package: Configuration of iplb + * Summary: Proposal function dispatcher. + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: iplb_proposal.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * + * Proposal function dispatcher for iplb configuration. + * See source/installation/proposal/proposal-API.txt + */ + +{ + +textdomain "iplb"; + +import "Iplb"; +import "Progress"; + +/* The main () */ +y2milestone("----------------------------------------"); +y2milestone("IPLB proposal started"); + +string func = (string) WFM::Args(0); +map param = (map) WFM::Args(1); +map ret = $[]; + +/* create a textual proposal */ +if(func == "MakeProposal") { + string proposal = ""; + string warning = nil; + symbol warning_level = nil; + boolean force_reset = param["force_reset"]:false; + + if(force_reset || !Iplb::ProposalValid()) { + Iplb::SetProposalValid (true); + boolean progress_orig = Progress::set (false); + Iplb::Read(); + Progress::set (progress_orig); + } + list sum = Iplb::Summary(); + proposal = sum[0]:""; + + ret = $[ + "preformatted_proposal" : proposal, + "warning_level" : warning_level, + "warning" : warning, + ]; +} +/* run the module */ +else if(func == "AskUser") { + map stored = Iplb::Export(); + symbol seq = (symbol) WFM::CallFunction("iplb", [.propose]); + if(seq != `next) Iplb::Import(stored); + y2debug("stored=%1",stored); + y2debug("seq=%1",seq); + ret = $[ + "workflow_sequence" : seq + ]; +} +/* create titles */ +else if(func == "Description") { + ret = $[ + /* Rich text title for Iplb in proposals */ + "rich_text_title" : _("Iplb"), + /* Menu title for Iplb in proposals */ + "menu_title" : _("&Iplb"), + "id" : "iplb", + ]; +} +/* write the proposal */ +else if(func == "Write") { + Iplb::Write(); +} +/* unknown function */ +else { + y2error("unknown function: %1", func); +} + +/* Finish */ +y2debug("ret=%1",ret); +y2milestone("IPLB proposal finished"); +y2milestone("----------------------------------------"); +return ret; + +/* EOF */ +} Added: trunk/iplb/src/vserver_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/vserver_conf.ycp?rev=67… ============================================================================== --- trunk/iplb/src/vserver_conf.ycp (added) +++ trunk/iplb/src/vserver_conf.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,461 @@ +/** + */ + +{ + +textdomain "iplb"; + +import "Popup"; +import "Sequencer"; +import "Report"; +import "Label"; +import "Wizard"; +import "Service"; +import "Iplb"; +import "IP"; + +include "iplb/helps.ycp"; +include "iplb/common.ycp"; + +// ids of widgets of vserver dialog +// virtual servers & real servers are not inlucded here +list<symbol> vserver_entries = [ + `checktype, + `service, + `checkcommand, + `checkport, + `request, + `receive, + `httpmethod, + `virtualhost, + `login, + `passwd, + `database, + `secret, + `scheduler, + `persistent, + `netmask, + `protocol, + // overwrite global value part + `checktimeout, + `negotiatetimeout, + `failurecount, + `emailalert, + `emailalertfreq, + `emailalertstatus, + `fallback, + `quiescent +]; + +list checktypes = [ + "", + "negotiate", + "connect", + "external", + "off", + "on", + "ping" +]; + +list services = [ + "", + "dns", + "ftp", + "http", + "https", + "imap", + "imaps", + "ldap", + "mysql", + "nntp", + "none", + "oracle", + "pgsql", + "pop", + "pops", + "radius", + "sim" +]; + +list httpmethods = [ + "", + "GET", + "HEAD" +]; + +list schedulers = [ + "", + "wrr", + "rr", + "lc", + "wlc", + "lblc", + "lblcr", + "dh", + "sh", + "sed", + "nq" +]; + +list protocols = [ + "", + "tcp", + "udp", + "fwm" +]; + +list emailalertstatus = [ + "", + "all", + "none", + "starting", + "running", + "stopping", + "reloading" +]; + + +term vserver_list_layout() +{ + return + `VBox(`opt(`hvstretch), + `DumbTab( + [ + `item(`id(`global_tab), "&Global Configuration"), + `item(`id(`vserver_tab), "&Virtual Server Configuration", true) + ], + `VBox(`opt(`hvstretch), + `SelectionBox( `id(`vserver_box), _("Virtual Servers")), + `Left(`HBox( + `PushButton(`id(`vserver_add), _("Add")), + `PushButton(`id(`vserver_edit), _("Edit")), + `PushButton(`id(`vserver_del), _("Delete")) + )) + ) + ) + ); +} + + +any vserver_list_dialog() +{ + symbol ret = nil; + my_SetContents("vserver_conf", vserver_list_layout()); + + while(true) { + // fill the vserver list box + // FIXME: set the cursor position + list<term> items = []; + foreach(string key, any val, (map<string, any>)Iplb::vserver_conf, { + if (Iplb::vserver_conf[key]:nil == nil) continue; + items = add(items, `item(key)); + }); + UI::ChangeWidget(`vserver_box, `Items, items); + + // disable the delete & edit button if vserver box is empty + integer n = size(items); + UI::ChangeWidget(`vserver_del, `Enabled, (n!=0)); + UI::ChangeWidget(`vserver_edit, `Enabled, (n!=0)); + + ret = (symbol)UI::UserInput(); + y2debug("___iplbdebug___ input=%1", ret); + + if (ret == `help) { + myHelp("vserver_conf"); + continue; + } + + if (ret == `vserver_del) { + string vserver_name = (string)UI::QueryWidget(`vserver_box, `CurrentItem); + Iplb::vserver_conf[vserver_name] = nil; + continue; + } + + if (contains([`ok, `cancel, `global_tab, `vserver_add, `vserver_edit], ret)) + break; + + y2error("unknown input %1", ret); + } + return ret; +} + +term vserver_layout(map l_vserver_conf) +{ + return + `VBox( + `TextEntry(`id(`vserver), "Virtual Server", ""), + `HBox( + `SelectionBox(`id(`rserver_box), "Real Servers"), + `Bottom(`VBox( + `PushButton(`id(`rserver_add), "Add"), + `PushButton(`id(`rserver_del), "Delete"), + `PushButton(`id(`rserver_edit), "Edit") + ) + )), + `HBox( + `ComboBox(`id(`checktype), `opt(`editable), "Check Type", checktypes), + `ComboBox(`id(`service), "Service", services), + `TextEntry(`id(`checkcommand), "Check Command", ""), + `TextEntry(`id(`checkport), "Check Port", "") + ), + `HBox( + `TextEntry(`id(`request), "Request", ""), + `TextEntry(`id(`receive), "Receive", ""), + `ComboBox(`id(`httpmethod), "Http Method", httpmethods), + `TextEntry(`id(`virtualhost), "Virtual Host", "") + ), + `HBox( + `TextEntry(`id(`login), "Login", ""), + `TextEntry(`id(`passwd), "Password", ""), + `TextEntry(`id(`database), "Database Name", ""), + `TextEntry(`id(`secret), "Radius Secret", "") + ), + `HBox( + `TextEntry(`id(`persistent), "Persistent", ""), + `TextEntry(`id(`netmask), "Netmask", ""), + `ComboBox(`id(`scheduler), "Scheduler", schedulers), + `ComboBox(`id(`protocol), "Protocol", protocols) + ), + `HBox( + `TextEntry(`id(`checktimeout), "Check Timeout", ""), + `TextEntry(`id(`negotiatetimeout), "Negotiate Timeout", ""), + `TextEntry(`id(`failurecount), "Failure Count", ""), + `TextEntry(`id(`emailalert), "Email Alert", "") + ), + `HBox( + `TextEntry(`id(`emailalertfreq), "Email Alert Freq", ""), + `ComboBox(`id(`emailalertstatus), "Email Alert Status", emailalertstatus), + `TextEntry(`id(`fallback), "Fallback", ""), + `ComboBox(`id(`quiescent), "Quiescent", yesno) + ), + `VStretch() + ); +} + + +// return `cacel or a string +any text_input_dialog(string title, string value) +{ + any ret = nil; + + UI::OpenDialog( + `MarginBox(1, 1, `VBox( + `MinWidth(100, `TextEntry(`id(`text), title, value)), + `VSpacing(1), + `Right(`HBox( + `PushButton(`id(`ok), _("OK")), + `PushButton(`id(`cancel), _("Cancel")) + )) + )) + ); + + ret = UI::UserInput(); + if (ret == `ok) ret = UI::QueryWidget(`text, `Value); + UI::CloseDialog(); + return ret; +} + +// fill the widgets accord to the @l_vserver_conf +void fill_vserver_entries(map l_vserver_conf) +{ + foreach(symbol key, vserver_entries, { + string name = substring(tostring(key), 1); // remove '`' char + list val = l_vserver_conf[name]:[]; + if (size(val) > 0) + UI::ChangeWidget(key, `Value, val[0]:""); + }); +} + + +// retrieve the value from widgets, save to @l_vserver_conf +map retrieve_vserver_entries(map l_vserver_conf) +{ + foreach(symbol key, vserver_entries, { + string name = substring(tostring(key), 1); // remove '`' char + list val_old = l_vserver_conf[name]:[]; + string val_new = (string)UI::QueryWidget(key, `Value); + if (size(val_new) > 0) + l_vserver_conf[name] = [val_new]; + else if (size(val_old) > 0) + // assigning nil to remove it from conf file + l_vserver_conf[name] = nil; + }); + return l_vserver_conf; +} + +any real_ip_input_dialog(string title,string value) + { + any ret=nil; + //split the real server ip value; + y2milestone("%1",value); + string ip=""; + string fwd_method=""; + integer weight=1; + integer pos=0; + list<string> real_ip=splitstring(value," \t"); + ip=real_ip[0]:""; + fwd_method=real_ip[1]:""; + if(real_ip[2]:""!="") + weight=tointeger(real_ip[2]:"1"); + + term layout=`VBox( + `VBox( + `Label("If using IPv6,the format should like this\n[fe80::5054:ff:fe00:2]"), + `InputField(`id(`ip),`opt(`hstretch),_("Real Server's IP Address"),"") + ), + `VSpacing(1), + `HBox( + `ComboBox(`id(`fwd_method),_("Forward Method"),["gate","ipip","masq"]), + `IntField(`id(`weight),_("weight"),0,65535,1) + ), + `VSpacing(1), + `Right(`HBox( + `PushButton(`id(`ok),_("OK")), + `PushButton(`id(`cancel),_("Cancel")) + )) + ); + UI::OpenDialog(layout); + UI::ChangeWidget(`ip,`Value,ip); + UI::ChangeWidget(`fwd_method,`Value,fwd_method); + UI::ChangeWidget(`weight,`Value,weight); + while(true){ + ret = UI::UserInput(); + if(ret == `ok ){ + string ip=(string)UI::QueryWidget(`id(`ip),`Value); + integer pos=0; + //get ipv6 and ipv4 address + //check IP Address for real server; + if(find(ip,"[")==0){//means ip has [ + //find next ] + pos=find(ip,"]"); + if(pos!=nil) + ip=substring(ip,1,pos-1); + }else + { + pos=find(ip,":"); + if(pos!=nil) + ip=substring(ip,0,pos); + } + + y2milestone("ip is %1",ip); + if(IP::Check(ip)==false){ + Popup::Message("IP address is not Valid"); + continue; + } + // if(IP::Check6((string)UI::QueryWidget(`id(`ip),`Value))==true) + // ret="["+(string)UI::QueryWidget(`id(`ip),`Value)+"]"; + // else + // ret=(string)UI::QueryWidget(`id(`ip),`Value); + ret=(string)UI::QueryWidget(`id(`ip),`Value); + // if((integer)UI::QueryWidget(`port,`Value)!=0) + // ret=":"+(integer)UI::QueryWidget(`port,`Value); + if(UI::QueryWidget(`fwd_method,`Value)!=nil) + ret=(string)ret+" "+(string)UI::QueryWidget(`fwd_method,`Value); + if(UI::QueryWidget(`weight,`Value)!=1) + ret=(string)ret+" "+(integer)UI::QueryWidget(`weight,`Value); + break; + } + if(ret == `cancel) + break; + } + UI::CloseDialog(); + return ret; + } + + +// return `ok or `cancel +any vserver_dialog(string vserver_name) +{ + any ret = nil; + map l_vserver_conf = Iplb::vserver_conf[vserver_name]:$[]; + y2milestone("___iplbdebug___ v=%2, l_v_c=%1", l_vserver_conf, vserver_name); + + my_SetContents("vserver_conf", vserver_layout(l_vserver_conf)); + fill_vserver_entries(l_vserver_conf); + UI::ChangeWidget(`vserver, `Value, vserver_name); + + while(true) { + // calculate the cursor position + integer n = size(l_vserver_conf["real"]:[]); + integer cursor = (integer)UI::QueryWidget(`rserver_box, `CurrentItem); + if (cursor == nil) cursor = 0; + if (cursor >= n) cursor = n - 1; + + // fill the rserver box, set the cursor position + // make the index of real list as the id of element of the rserver selectbox + integer i = 0; + list<term> rs_box = []; + foreach (string value, l_vserver_conf["real"]:[], { + rs_box = add(rs_box, `item(`id(i), value)); + i = i + 1; + }); + UI::ChangeWidget(`rserver_box, `Items, rs_box); + UI::ChangeWidget(`rserver_box, `CurrentItem, cursor); + + // disable the delete & edit button if rservers box is empty + UI::ChangeWidget(`rserver_del, `Enabled, (n!=0)); + UI::ChangeWidget(`rserver_edit, `Enabled, (n!=0)); + + ret = UI::UserInput(); + y2debug("___iplbdebug___ input=%1", ret); + + if (ret == `rserver_add) { + ret = real_ip_input_dialog("Add a new real server:",""); + if (ret != `cancel){ + y2milestone("%1",(string)ret); + l_vserver_conf["real"] = add(l_vserver_conf["real"]:[], ret); + } + continue; + } + + if (ret == `rserver_edit) { + integer current = (integer)UI::QueryWidget(`rserver_box, `CurrentItem); + ret = real_ip_input_dialog("Edit the real server:", + l_vserver_conf["real", current]:""); + if (ret != `cancel) l_vserver_conf["real", current] = ret; + continue; + } + + if (ret == `rserver_del) { + integer current = (integer)UI::QueryWidget(`rserver_box, `CurrentItem); + l_vserver_conf["real"] = remove(l_vserver_conf["real"]:[], current); + continue; + } + + if (ret == `ok) { + l_vserver_conf = retrieve_vserver_entries(l_vserver_conf); + Iplb::vserver_conf[vserver_name] = nil; + vserver_name = (string)UI::QueryWidget(`vserver, `Value); + Iplb::vserver_conf[vserver_name] = l_vserver_conf; + break; + } + + if (ret == `cancel) break; + + y2debug("___iplbdebug___ unknown input %1", ret); + } + + return ret; +} + + +any vserver_add_dialog() +{ + any ret = nil; + ret = vserver_dialog(""); + return ret; +} + + +any vserver_edit_dialog() +{ + any ret = nil; + string vserver_name = (string) UI::QueryWidget(`id(`vserver_box), `CurrentItem); + ret = vserver_dialog(vserver_name); + + return ret; +} + + +/* EOF */ +} Added: trunk/iplb/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/src/wizards.ycp?rev=67509&v… ============================================================================== --- trunk/iplb/src/wizards.ycp (added) +++ trunk/iplb/src/wizards.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,180 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/iplb/wizards.ycp + * Package: Configuration of iplb + * Summary: Wizards definitions + * Authors: Cong Meng <cmeng(a)novell.com> + * + * $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $ + */ + +{ + +textdomain "iplb"; + +import "Sequencer"; +import "Wizard"; + +include "iplb/complex.ycp"; +include "iplb/dialogs.ycp"; +include "iplb/global_conf.ycp"; +include "iplb/vserver_conf.ycp"; + +/** + * Add a configuration of iplb + * @return sequence result + */ +any AddSequence() { + + /* FIXME: adapt to your needs */ + map aliases = $[ + "config1" : ``(Configure1Dialog()), + "config2" : ``(Configure2Dialog()), + ]; + + /* FIXME: adapt to your needs */ + map sequence = $[ + "ws_start" : "config1", + "config1" : $[ + `abort : `abort, + `next : "config2" + ], + "config2" : $[ + `abort : `abort, + `next : `next + ] + ]; + + return Sequencer::Run(aliases, sequence); +} + +/** + * Main workflow of the iplb configuration + * @return sequence result + */ +any MainSequence() { + /* + +- global_conf + +- vserver_list_conf + +- vserver_add_conf + +- vserver_edit_conf + */ + map Aliases = $[ + "global_conf" : ``(global_dialog()), + "vserver_list_conf" : ``(vserver_list_dialog()), + "vserver_add_conf" : ``(vserver_add_dialog()), + "vserver_edit_conf" : ``(vserver_edit_dialog()) + ]; + + map sequence = $[ + "ws_start": "global_conf", + "global_conf" : $[ + `ok : `next, + `cancel : `abort, + `global_tab : "global_conf", + `vserver_tab : "vserver_list_conf" + ], + "vserver_list_conf" : $[ + `ok : `next, + `cancel : `abort, + `global_tab : "global_conf", + `vserver_add : "vserver_add_conf", + `vserver_edit : "vserver_edit_conf" + ], + "vserver_add_conf" : $[ + `ok : "vserver_list_conf", + `cancel : "vserver_list_conf" + ], + "vserver_edit_conf" : $[ + `ok : "vserver_list_conf", + `cancel : "vserver_list_conf" + ] + ]; + + // Buttons redefinition + Wizard::SetNextButton(`ok, "OK"); + Wizard::SetAbortButton(`cancel, "Cancel"); + Wizard::HideBackButton(); + + any ret = Sequencer::Run(Aliases, sequence); + return ret; +} + +/** + * Whole configuration of iplb + * @return sequence result + */ +any IplbSequence() { + map aliases = $[ + "read" : [ ``( ReadDialog() ), true ], + "main" : ``( MainSequence() ), + "write" : [ ``( WriteDialog() ), true ] + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `next : "write" + ], + "write" : $[ + `abort : `abort, + `next : `next + ] + ]; + + Wizard::CreateDialog(); + + any ret = Sequencer::Run(aliases, sequence); + + UI::CloseDialog(); + return ret; +} + +/** + * Whole configuration of iplb but without reading and writing. + * For use with autoinstallation. + * @return sequence result + */ +any IplbAutoSequence() { + + /* Initialization dialog caption */ + string caption = _("IPLB Configuration"); + /* Initialization dialog contents */ + term contents = `Label(_("Initializing...")); + + Wizard::CreateDialog(); + Wizard::SetContentsButtons(caption, contents, "", + Label::BackButton(), Label::NextButton()); + + any ret = MainSequence(); + + UI::CloseDialog(); + return ret; +} + +/* EOF */ +} Added: trunk/iplb/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/.cvsignore?rev=67… ============================================================================== --- trunk/iplb/testsuite/.cvsignore (added) +++ trunk/iplb/testsuite/.cvsignore Wed Feb 22 11:55:23 2012 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: trunk/iplb/testsuite/Makefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/Makefile?rev=6750… ============================================================================== --- trunk/iplb/testsuite/Makefile (added) +++ trunk/iplb/testsuite/Makefile Wed Feb 22 11:55:23 2012 @@ -0,0 +1,387 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# testsuite/Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +pkgdatadir = $(datadir)/yast2-iplb +pkglibdir = $(libdir)/yast2-iplb +pkgincludedir = $(includedir)/yast2-iplb +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = i686-suse-linux-gnu +host_triplet = i686-suse-linux-gnu +target_triplet = i686-suse-linux-gnu +subdir = testsuite +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DEJATOOL = $(PACKAGE) +RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXPECT = expect +RUNTEST = runtest +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run aclocal-1.10 +AMTAR = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run tar +AUTOCONF = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run autoconf +AUTOHEADER = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run autoheader +AUTOMAKE = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run automake-1.10 +AWK = gawk +CYGPATH_W = echo +DEFS = -DPACKAGE_NAME=\"yast2-iplb\" -DPACKAGE_TARNAME=\"yast2-iplb\" -DPACKAGE_VERSION=\"2.15.0\" -DPACKAGE_STRING=\"yast2-iplb\ 2.15.0\" -DPACKAGE_BUGREPORT=\"http://bugs.opensuse.org/\" -DPACKAGE=\"yast2-iplb\" -DVERSION=\"2.15.0\" +ECHO_C = +ECHO_N = -n +ECHO_T = +INSTALL = /usr/bin/install -c -p +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +LIBOBJS = +LIBS = +LN_S = ln -s +LTLIBOBJS = +MAINTAINER = Cong Meng <cmeng(a)novell.com> +MAKEINFO = ${SHELL} /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/missing --run makeinfo +MKDIR_P = /bin/mkdir -p +PACKAGE = yast2-iplb +PACKAGE_BUGREPORT = http://bugs.opensuse.org/ +PACKAGE_NAME = yast2-iplb +PACKAGE_STRING = yast2-iplb 2.15.0 +PACKAGE_TARNAME = yast2-iplb +PACKAGE_VERSION = 2.15.0 +PATH_SEPARATOR = : +PKG_CONFIG_PATH = +RPMNAME = yast2-iplb +SET_MAKE = +SHELL = /bin/sh +STRIP = +STYLESHEET_CSS = /usr/share/YaST2/data/docbook/css/yast2docs.css +STYLESHEET_HTML = /usr/share/YaST2/data/docbook/stylesheets/customize-html.xsl +STYLESHEET_PDF = /usr/share/YaST2/data/docbook/stylesheets/customize-fo.xsl +STYLESHEET_YCPDOC = /usr/share/YaST2/data/docbook/stylesheets/ycpdoc.xsl +STYLESHEET_YDOC = /usr/share/YaST2/data/docbook/stylesheets/ydoc.xsl +VERSION = 2.15.0 +XGETTEXT = /usr/bin/xgettext +Y2DEVTOOLS_PREFIX = /usr +YCPC = /usr/bin/ycpc +YCPDOC = /usr/lib/YaST2/bin/ycpdoc +YCPMAKEDEP = /usr/lib/YaST2/bin/ycpmakedep +abs_builddir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/testsuite +abs_srcdir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/testsuite +abs_top_builddir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0 +abs_top_srcdir = /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0 +agentdir = ${prefix}/lib/YaST2/servers_non_y2 +am__leading_dot = . +am__tar = tar --format=ustar -chf - "$$tardir" +am__untar = tar -xf - +bindir = ${exec_prefix}/bin +build = i686-suse-linux-gnu +build_alias = +build_cpu = i686 +build_os = linux-gnu +build_vendor = suse +builddir = . +clientdir = ${prefix}/share/YaST2/clients +datadir = ${datarootdir} +datarootdir = ${prefix}/share +desktopdir = ${prefix}/share/applications/YaST2 +docdir = ${prefix}/share/doc/packages/yast2-iplb +dvidir = ${docdir} +exec_prefix = ${prefix} +execcompdir = ${prefix}/lib/YaST2 +fillupdir = /var/adm/fillup-templates +host = i686-suse-linux-gnu +host_alias = +host_cpu = i686 +host_os = linux-gnu +host_vendor = suse +htmldir = ${docdir} +imagedir = ${prefix}/share/YaST2/images +includedir = ${prefix}/include/YaST2 +infodir = ${datarootdir}/info +install_sh = $(SHELL) /home/cmeng/work/yast2-iplb/home:cmeng:Factory/yast2-iplb/yast2-iplb-2.15.0/install-sh +libdir = /usr/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${prefix}/share/YaST2/locale +localstatedir = ${prefix}/var +mandir = ${prefix}/share/man +mkdir_p = /bin/mkdir -p +moduledir = ${prefix}/share/YaST2/modules +oldincludedir = /usr/include +pdfdir = ${docdir} +pkgconfigdatadir = ${datadir}/pkgconfig +pkgconfigdir = ${libdir}/pkgconfig +plugindir = ${libdir}/YaST2/plugin +potdir = ${docdir}/pot +prefix = /usr +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +schemadir = ${prefix}/share/YaST2/schema +scrconfdir = ${prefix}/share/YaST2/scrconf +sharedstatedir = ${prefix}/com +srcdir = . +sysconfdir = ${prefix}/etc +target = i686-suse-linux-gnu +target_alias = +target_cpu = i686 +target_os = linux-gnu +target_vendor = suse +themedir = ${prefix}/share/YaST2/theme +top_build_prefix = ../ +top_builddir = .. +top_srcdir = .. +yast2dir = ${prefix}/share/YaST2 +ybindir = ${prefix}/lib/YaST2/bin +ydatadir = ${prefix}/share/YaST2/data +yncludedir = ${prefix}/share/YaST2/include +ystartupdir = ${prefix}/lib/YaST2 +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +testsuite_prepare = ${prefix}/share/YaST2/data/testsuite/Makefile.testsuite +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu testsuite/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +check-DEJAGNU: site.exp + srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ + if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + then :; else exit_status=1; fi; \ + done; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi; \ + exit $$exit_status +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + +distclean-DEJAGNU: + -rm -f site.exp site.bak + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-DEJAGNU distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-DEJAGNU check-am check-local \ + clean clean-generic clean-local distclean distclean-DEJAGNU \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/iplb/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/Makefile.am?rev=6… ============================================================================== --- trunk/iplb/testsuite/Makefile.am (added) +++ trunk/iplb/testsuite/Makefile.am Wed Feb 22 11:55:23 2012 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/iplb/testsuite/Makefile.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/Makefile.in?rev=6… ============================================================================== --- trunk/iplb/testsuite/Makefile.in (added) +++ trunk/iplb/testsuite/Makefile.in Wed Feb 22 11:55:23 2012 @@ -0,0 +1,387 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = testsuite +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DEJATOOL = $(PACKAGE) +RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXPECT = expect +RUNTEST = runtest +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +clientdir = @clientdir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu testsuite/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +check-DEJAGNU: site.exp + srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ + if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + then :; else exit_status=1; fi; \ + done; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi; \ + exit $$exit_status +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + +distclean-DEJAGNU: + -rm -f site.exp site.bak + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-DEJAGNU distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am all-local check check-DEJAGNU check-am check-local \ + clean clean-generic clean-local distclean distclean-DEJAGNU \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Added: trunk/iplb/testsuite/tests/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/tests/.cvsignore?… ============================================================================== (empty) Added: trunk/iplb/testsuite/tests/Iplb.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/tests/Iplb.err?re… ============================================================================== (empty) Added: trunk/iplb/testsuite/tests/Iplb.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/tests/Iplb.out?re… ============================================================================== --- trunk/iplb/testsuite/tests/Iplb.out (added) +++ trunk/iplb/testsuite/tests/Iplb.out Wed Feb 22 11:55:23 2012 @@ -0,0 +1,2 @@ +Dump Iplb::Modified +Return false Added: trunk/iplb/testsuite/tests/Iplb.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/testsuite/tests/Iplb.ycp?re… ============================================================================== --- trunk/iplb/testsuite/tests/Iplb.ycp (added) +++ trunk/iplb/testsuite/tests/Iplb.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,13 @@ +{ + +// testedfiles: Iplb.ycp + +include "testsuite.ycp"; +TESTSUITE_INIT([], nil); + +import "Iplb"; + +DUMP("Iplb::Modified"); +TEST(``(Iplb::Modified()), [], nil); + +} Added: trunk/iplb/vserver_conf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/vserver_conf.ycp?rev=67509&… ============================================================================== --- trunk/iplb/vserver_conf.ycp (added) +++ trunk/iplb/vserver_conf.ycp Wed Feb 22 11:55:23 2012 @@ -0,0 +1,465 @@ +/** + */ + +{ + +textdomain "iplb"; + +import "Popup"; +import "Sequencer"; +import "Report"; +import "Label"; +import "Wizard"; +import "Service"; +import "Iplb"; +import "IP"; + +include "iplb/helps.ycp"; +include "iplb/common.ycp"; + +// ids of widgets of vserver dialog +// virtual servers & real servers are not inlucded here +list<symbol> vserver_entries = [ + `checktype, + `service, + `checkcommand, + `checkport, + `request, + `receive, + `httpmethod, + `virtualhost, + `login, + `passwd, + `database, + `secret, + `scheduler, + `persistent, + `netmask, + `protocol, + // overwrite global value part + `checktimeout, + `negotiatetimeout, + `failurecount, + `emailalert, + `emailalertfreq, + `emailalertstatus, + `fallback, + `quiescent +]; + +list checktypes = [ + "", + "negotiate", + "connect", + "external", + "off", + "on", + "ping" +]; + +list services = [ + "", + "dns", + "ftp", + "http", + "https", + "imap", + "imaps", + "ldap", + "mysql", + "nntp", + "none", + "oracle", + "pgsql", + "pop", + "pops", + "radius", + "sim" +]; + +list httpmethods = [ + "", + "GET", + "HEAD" +]; + +list schedulers = [ + "", + "wrr", + "rr", + "lc", + "wlc", + "lblc", + "lblcr", + "dh", + "sh", + "sed", + "nq" +]; + +list protocols = [ + "", + "tcp", + "udp", + "fwm" +]; + +list emailalertstatus = [ + "", + "all", + "none", + "starting", + "running", + "stopping", + "reloading" +]; + + +term vserver_list_layout() +{ + return + `VBox(`opt(`hvstretch), + `DumbTab( + [ + `item(`id(`global_tab), "&Global Configuration"), + `item(`id(`vserver_tab), "&Virtual Server Configuration", true) + ], + `VBox(`opt(`hvstretch), + `SelectionBox( `id(`vserver_box), _("Virtual Servers")), + `Left(`HBox( + `PushButton(`id(`vserver_add), _("Add")), + `PushButton(`id(`vserver_edit), _("Edit")), + `PushButton(`id(`vserver_del), _("Delete")) + )) + ) + ) + ); +} + + +any vserver_list_dialog() +{ + symbol ret = nil; + my_SetContents("vserver_conf", vserver_list_layout()); + + while(true) { + // fill the vserver list box + // FIXME: set the cursor position + list<term> items = []; + foreach(string key, any val, (map<string, any>)Iplb::vserver_conf, { + if (Iplb::vserver_conf[key]:nil == nil) continue; + items = add(items, `item(key)); + }); + UI::ChangeWidget(`vserver_box, `Items, items); + + // disable the delete & edit button if vserver box is empty + integer n = size(items); + UI::ChangeWidget(`vserver_del, `Enabled, (n!=0)); + UI::ChangeWidget(`vserver_edit, `Enabled, (n!=0)); + + ret = (symbol)UI::UserInput(); + y2debug("___iplbdebug___ input=%1", ret); + + if (ret == `help) { + myHelp("vserver_conf"); + continue; + } + + if (ret == `vserver_del) { + string vserver_name = (string)UI::QueryWidget(`vserver_box, `CurrentItem); + Iplb::vserver_conf[vserver_name] = nil; + continue; + } + + if (contains([`ok, `cancel, `global_tab, `vserver_add, `vserver_edit], ret)) + break; + + y2error("unknown input %1", ret); + } + return ret; +} + +term vserver_layout(map l_vserver_conf) +{ + return + `VBox( + `TextEntry(`id(`vserver), "Virtual Server", ""), + `HBox( + `SelectionBox(`id(`rserver_box), "Real Servers"), + `Bottom(`VBox( + `PushButton(`id(`rserver_add), "Add"), + `PushButton(`id(`rserver_del), "Delete"), + `PushButton(`id(`rserver_edit), "Edit") + ) + )), + `HBox( + `ComboBox(`id(`checktype), `opt(`editable), "Check Type", checktypes), + `ComboBox(`id(`service), "Service", services), + `TextEntry(`id(`checkcommand), "Check Command", ""), + `TextEntry(`id(`checkport), "Check Port", "") + ), + `HBox( + `TextEntry(`id(`request), "Request", ""), + `TextEntry(`id(`receive), "Receive", ""), + `ComboBox(`id(`httpmethod), "Http Method", httpmethods), + `TextEntry(`id(`virtualhost), "Virtual Host", "") + ), + `HBox( + `TextEntry(`id(`login), "Login", ""), + `TextEntry(`id(`passwd), "Password", ""), + `TextEntry(`id(`database), "Database Name", ""), + `TextEntry(`id(`secret), "Radius Secret", "") + ), + `HBox( + `TextEntry(`id(`persistent), "Persistent", ""), + `TextEntry(`id(`netmask), "Netmask", ""), + `ComboBox(`id(`scheduler), "Scheduler", schedulers), + `ComboBox(`id(`protocol), "Protocol", protocols) + ), + `HBox( + `TextEntry(`id(`checktimeout), "Check Timeout", ""), + `TextEntry(`id(`negotiatetimeout), "Negotiate Timeout", ""), + `TextEntry(`id(`failurecount), "Failure Count", ""), + `TextEntry(`id(`emailalert), "Email Alert", "") + ), + `HBox( + `TextEntry(`id(`emailalertfreq), "Email Alert Freq", ""), + `ComboBox(`id(`emailalertstatus), "Email Alert Status", emailalertstatus), + `TextEntry(`id(`fallback), "Fallback", ""), + `ComboBox(`id(`quiescent), "Quiescent", yesno) + ), + `VStretch() + ); +} + + +// return `cacel or a string +any text_input_dialog(string title, string value) +{ + any ret = nil; + + UI::OpenDialog( + `MarginBox(1, 1, `VBox( + `MinWidth(100, `TextEntry(`id(`text), title, value)), + `VSpacing(1), + `Right(`HBox( + `PushButton(`id(`ok), _("OK")), + `PushButton(`id(`cancel), _("Cancel")) + )) + )) + ); + + ret = UI::UserInput(); + if (ret == `ok) ret = UI::QueryWidget(`text, `Value); + UI::CloseDialog(); + return ret; +} + +// fill the widgets accord to the @l_vserver_conf +void fill_vserver_entries(map l_vserver_conf) +{ + foreach(symbol key, vserver_entries, { + string name = substring(tostring(key), 1); // remove '`' char + list val = l_vserver_conf[name]:[]; + if (size(val) > 0) + UI::ChangeWidget(key, `Value, val[0]:""); + }); +} + + +// retrieve the value from widgets, save to @l_vserver_conf +map retrieve_vserver_entries(map l_vserver_conf) +{ + foreach(symbol key, vserver_entries, { + string name = substring(tostring(key), 1); // remove '`' char + list val_old = l_vserver_conf[name]:[]; + string val_new = (string)UI::QueryWidget(key, `Value); + if (size(val_new) > 0) + l_vserver_conf[name] = [val_new]; + else if (size(val_old) > 0) + // assigning nil to remove it from conf file + l_vserver_conf[name] = nil; + }); + return l_vserver_conf; +} + +any real_ip_input_dialog(string title,string value) + { + any ret=nil; + //split the real server ip value; + y2milestone("%1",value); + string ip=""; + string fwd_method=""; + integer weight=1; + integer pos=0; + + list<string> real_ip=splitstring(value," \t"); + ip=real_ip[0]:""; + fwd_method=real_ip[1]:""; + if(real_ip[2]:""!="") + weight=tointeger(real_ip[2]:"1"); + + term layout=`VBox( + `HBox( + `InputField(`id(`ip),`opt(`hstretch),_("Real Server's IP Address"),"") + ), + `HBox( + `ComboBox(`id(`fwd_method),_("Forward Method"),["gate","ipip","masq"]), + `IntField(`id(`weight),_("weight"),0,65535,1) + ), + `VSpacing(1), + `Right(`HBox( + `PushButton(`id(`ok),_("OK")), + `PushButton(`id(`cancel),_("Cancel")) + )) + + ); + + UI::OpenDialog(layout); + + UI::ChangeWidget(`ip,`Value,ip); + UI::ChangeWidget(`fwd_method,`Value,fwd_method); + UI::ChangeWidget(`weight,`Value,weight); + while(true){ + ret = UI::UserInput(); + if(ret == `ok ){ + string ip=(string)UI::QueryWidget(`id(`ip),`Value); + integer pos=0; + + //get ipv6 and ipv4 address + //check IP Address for real server; + if(find(ip,"[")==0){//means ip has [ + //find next ] + pos=find(ip,"]"); + if(pos!=nil) + ip=substring(ip,1,pos-1); + }else + { + pos=find(ip,":"); + if(pos!=nil) + ip=substring(ip,0,pos-1); + } + + y2milestone("ip is %1",ip); + if(IP::Check(ip)==false){ + Popup::Message("IP address is not Valid"); + continue; + } + // if(IP::Check6((string)UI::QueryWidget(`id(`ip),`Value))==true) + // ret="["+(string)UI::QueryWidget(`id(`ip),`Value)+"]"; + // else + // ret=(string)UI::QueryWidget(`id(`ip),`Value); + + ret=(string)UI::QueryWidget(`id(`ip),`Value); + // if((integer)UI::QueryWidget(`port,`Value)!=0) + // ret=":"+(integer)UI::QueryWidget(`port,`Value); + if(UI::QueryWidget(`fwd_method,`Value)!=nil) + ret=(string)ret+" "+(string)UI::QueryWidget(`fwd_method,`Value); + if(UI::QueryWidget(`weight,`Value)!=1) + ret=(string)ret+" "+(integer)UI::QueryWidget(`weight,`Value); + break; + } + if(ret == `cancel) + break; + } + UI::CloseDialog(); + return ret; + } + + +// return `ok or `cancel +any vserver_dialog(string vserver_name) +{ + any ret = nil; + map l_vserver_conf = Iplb::vserver_conf[vserver_name]:$[]; + y2milestone("___iplbdebug___ v=%2, l_v_c=%1", l_vserver_conf, vserver_name); + + my_SetContents("vserver_conf", vserver_layout(l_vserver_conf)); + fill_vserver_entries(l_vserver_conf); + UI::ChangeWidget(`vserver, `Value, vserver_name); + + while(true) { + // calculate the cursor position + integer n = size(l_vserver_conf["real"]:[]); + integer cursor = (integer)UI::QueryWidget(`rserver_box, `CurrentItem); + if (cursor == nil) cursor = 0; + if (cursor >= n) cursor = n - 1; + + // fill the rserver box, set the cursor position + // make the index of real list as the id of element of the rserver selectbox + integer i = 0; + list<term> rs_box = []; + foreach (string value, l_vserver_conf["real"]:[], { + rs_box = add(rs_box, `item(`id(i), value)); + i = i + 1; + }); + UI::ChangeWidget(`rserver_box, `Items, rs_box); + UI::ChangeWidget(`rserver_box, `CurrentItem, cursor); + + // disable the delete & edit button if rservers box is empty + UI::ChangeWidget(`rserver_del, `Enabled, (n!=0)); + UI::ChangeWidget(`rserver_edit, `Enabled, (n!=0)); + + ret = UI::UserInput(); + y2debug("___iplbdebug___ input=%1", ret); + + if (ret == `rserver_add) { + ret = real_ip_input_dialog("Add a new real server:",""); + if (ret != `cancel){ + y2milestone("%1",(string)ret); + l_vserver_conf["real"] = add(l_vserver_conf["real"]:[], ret); + } + continue; + } + + if (ret == `rserver_edit) { + integer current = (integer)UI::QueryWidget(`rserver_box, `CurrentItem); + ret = real_ip_input_dialog("Edit the real server:", + l_vserver_conf["real", current]:""); + if (ret != `cancel) l_vserver_conf["real", current] = ret; + continue; + } + + if (ret == `rserver_del) { + integer current = (integer)UI::QueryWidget(`rserver_box, `CurrentItem); + l_vserver_conf["real"] = remove(l_vserver_conf["real"]:[], current); + continue; + } + + if (ret == `ok) { + l_vserver_conf = retrieve_vserver_entries(l_vserver_conf); + Iplb::vserver_conf[vserver_name] = nil; + vserver_name = (string)UI::QueryWidget(`vserver, `Value); + Iplb::vserver_conf[vserver_name] = l_vserver_conf; + break; + } + + if (ret == `cancel) break; + + y2debug("___iplbdebug___ unknown input %1", ret); + } + + return ret; +} + + +any vserver_add_dialog() +{ + any ret = nil; + ret = vserver_dialog(""); + return ret; +} + + +any vserver_edit_dialog() +{ + any ret = nil; + string vserver_name = (string) UI::QueryWidget(`id(`vserver_box), `CurrentItem); + ret = vserver_dialog(vserver_name); + + return ret; +} + + +/* EOF */ +} Added: trunk/iplb/yast2-iplb.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/iplb/yast2-iplb.spec.in?rev=6750… ============================================================================== --- trunk/iplb/yast2-iplb.spec.in (added) +++ trunk/iplb/yast2-iplb.spec.in Wed Feb 22 11:55:23 2012 @@ -0,0 +1,31 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of iplb + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/iplb +@yncludedir@/iplb/* +@clientdir@/iplb.ycp +@clientdir@/iplb_*.ycp +@moduledir@/Iplb.* +@moduledir@/Iplb2.* +@desktopdir@/iplb.desktop +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67508 - /trunk/cluster/MAINTAINER
by deanraccoon＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: deanraccoon Date: Wed Feb 22 11:44:56 2012 New Revision: 67508 URL: http://svn.opensuse.org/viewcvs/yast?rev=67508&view=rev Log: edit maintainer Modified: trunk/cluster/MAINTAINER Modified: trunk/cluster/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/MAINTAINER?rev=67508&r1=… ============================================================================== --- trunk/cluster/MAINTAINER (original) +++ trunk/cluster/MAINTAINER Wed Feb 22 11:44:56 2012 @@ -1 +1 @@ -XWHu(a)suse.com +dmzhang(a)suse.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67507 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 11:16:07 2012 New Revision: 67507 URL: http://svn.opensuse.org/viewcvs/yast?rev=67507&view=rev Log: - show device name in zfcp dialog Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 22 11:16:07 2012 @@ -130,24 +130,9 @@ /* Dialog caption */ string caption = _("DASD Disk Management"); - term header = `header( - // table header - `Right(_("Channel")), - // table header - _("Device"), - // table header - _("Type"), - // table header - _("Access Type"), - // table header - _("Use DIAG"), - // table header - _("Formatted"), - // table header - _("Partition Information") - ); + term header = `Empty(); - if (Mode::config ()) + if (Mode::config()) { header = `header( // table header @@ -156,7 +141,26 @@ _("Format"), // table header _("Use DIAG") - ); + ); + } + else + { + header = `header( + // table header + `Right(_("Channel")), + // table header + _("Device"), + // table header + _("Type"), + // table header + _("Access Type"), + // table header + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); } list actions = [ Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Wed Feb 22 11:16:07 2012 @@ -69,12 +69,25 @@ list<term> items = []; - items = maplist(integer k, map<string, any> d, devices, { - string channel = d["detail", "controller_id"]:""; - string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - return `item(`id(k), channel, wwpn, fcp_lun); - }); + if (Mode::config()) + { + items = maplist(integer k, map<string, any> d, devices, { + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; + return `item(`id(k), channel, wwpn, fcp_lun); + }); + } + else + { + items = maplist(integer k, map<string, any> d, devices, { + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; + string dev_name = d["dev_name"]:""; + return `item(`id(k), channel, wwpn, fcp_lun, dev_name); + }); + } return items; } @@ -91,14 +104,32 @@ /* Dialog caption */ string caption = _("Configured ZFCP Devices"); - term header = `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("ZFCP-LUN")) - ); + term header = `Empty(); + + if (Mode::config()) + { + header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + } + else + { + header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")), + // table header + _("Device") + ); + } /* Dialog content */ term content = `VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67506 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: aschnell Date: Wed Feb 22 10:25:25 2012 New Revision: 67506 URL: http://svn.opensuse.org/viewcvs/yast?rev=67506&view=rev Log: - added tolower in FormatChannel Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 22 10:25:25 2012 @@ -118,7 +118,7 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(channel, "."); + list<string> strs = splitstring(tolower(channel), "."); strs[2] = String::PadZeros(strs[2]:"", 4); return mergestring(strs, "."); } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Wed Feb 22 10:25:25 2012 @@ -104,7 +104,7 @@ if (!IsValidChannel(channel)) return channel; - list<string> strs = splitstring(channel, "."); + list<string> strs = splitstring(tolower(channel), "."); strs[2] = String::PadZeros(strs[2]:"", 4); return mergestring(strs, "."); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67505 - /tags/branch-Code-11-SP2-2_17_47/product-creator/
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 08:32:02 2012 New Revision: 67505 URL: http://svn.opensuse.org/viewcvs/yast?rev=67505&view=rev Log: Created tag branch-Code-11-SP2-2_17_47 for product-creator Added: tags/branch-Code-11-SP2-2_17_47/product-creator/ (props changed) - copied from r67504, branches/SuSE-Code-11-SP2-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67504 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn2.opensuse.org 22 Feb '12

22 Feb '12

Author: jsuchome Date: Wed Feb 22 08:31:33 2012 New Revision: 67504 URL: http://svn.opensuse.org/viewcvs/yast?rev=67504&view=rev Log: - do not show duplicates in locale entry (bnc#748122) - 2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Wed Feb 22 08:31:33 2012 @@ -1 +1 @@ -2.17.46 +2.17.47 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Wed Feb 22 08:31:33 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 22 08:07:48 CET 2012 - jsuchome(a)suse.cz + +- do not show duplicates in locale entry (bnc#748122) +- 2.17.47 + +------------------------------------------------------------------- Tue Oct 18 11:09:57 CEST 2011 - jsuchome(a)suse.cz - added UI for disk encryption (fate#312486) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Wed Feb 22 08:31:33 2012 @@ -80,7 +80,7 @@ string logs_directory = "/tmp"; // all available locales - global list<string> all_locales = []; + global map<string,integer> all_locales = $[]; // all available time zones global list<string> all_timezones = []; Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Wed Feb 22 08:31:33 2012 @@ -633,15 +633,16 @@ string lang = KiwiConfig["preferences",0,id,0,content_key]:""; list items = []; - if (Kiwi::all_locales == []) + if (Kiwi::all_locales == $[]) { map out = (map) SCR::Execute (.target.bash_output, "/usr/bin/locale -a"); - Kiwi::all_locales = filter (string s, splitstring (out["stdout"]:"", "\n"), { - return s != ""; + foreach (string line, splitstring (out["stdout"]:"", "\n"), { + string code = splitstring (line, ".@")[0]:line; + if (code != "") + Kiwi::all_locales[code] = 1; }); } - foreach (string line, Kiwi::all_locales, { - string code = splitstring (line, ".@")[0]:line; + foreach (string code, integer i, Kiwi::all_locales, { items = add (items, `item (`id (code), code, lang == code)); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67503 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 20:53:13 2012 New Revision: 67503 URL: http://svn.opensuse.org/viewcvs/yast?rev=67503&view=rev Log: - set focus Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Tue Feb 21 20:53:13 2012 @@ -89,7 +89,7 @@ string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), - substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), + substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), substring(tohexstring(d["sub_device_id"]:0 & 0xffff, 4), 2), substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); @@ -491,6 +491,8 @@ UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); + UI::SetFocus(`id(`channel)); + symbol ret = nil; while (ret == nil) { Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 20:53:13 2012 @@ -263,6 +263,8 @@ UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); UI::ChangeWidget(`id(`fcp_lun), `ValidChars, "0123456789abcdefABCDEFx"); + UI::SetFocus(`id(`channel)); + symbol ret = nil; while (ret == nil) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67502 - /trunk/s390/src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 20:49:32 2012 New Revision: 67502 URL: http://svn.opensuse.org/viewcvs/yast?rev=67502&view=rev Log: - set valid chars Modified: trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 20:49:32 2012 @@ -261,6 +261,7 @@ UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); + UI::ChangeWidget(`id(`fcp_lun), `ValidChars, "0123456789abcdefABCDEFx"); symbol ret = nil; while (ret == nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67501 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 20:23:40 2012 New Revision: 67501 URL: http://svn.opensuse.org/viewcvs/yast?rev=67501&view=rev Log: - more input validation Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Tue Feb 21 20:23:40 2012 @@ -45,6 +45,7 @@ return ret ? `next : `abort; } + /** * Write settings dialog * @return `abort if aborted and `next otherwise @@ -56,6 +57,7 @@ return ret ? `next : `abort; } + /** * Get the list of items for the table of DASD devices * @param min_chan integer minimal channel number @@ -112,6 +114,7 @@ return items; } + /** * Draw the DASD dialog */ Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 21 20:23:40 2012 @@ -253,14 +253,14 @@ GetFilteredDevices() { list<string> min_strs = splitstring(filter_min, "."); - integer min_css = tointeger("0x" + min_strs[0]:"0"); - integer min_lcss = tointeger("0x" + min_strs[1]:"0"); - integer min_chan = tointeger("0x" + min_strs[2]:"0"); + integer min_css = tointeger("0x" + min_strs[0]:""); + integer min_lcss = tointeger("0x" + min_strs[1]:""); + integer min_chan = tointeger("0x" + min_strs[2]:""); list<string> max_strs = splitstring(filter_max, "."); - integer max_css = tointeger("0x" + max_strs[0]:"0"); - integer max_lcss = tointeger("0x" + max_strs[1]:"0"); - integer max_chan = tointeger("0x" + max_strs[2]:"0"); + integer max_css = tointeger("0x" + max_strs[0]:""); + integer max_lcss = tointeger("0x" + max_strs[1]:""); + integer max_chan = tointeger("0x" + max_strs[2]:""); map<integer, map<string, any> > ret = GetDevices(); @@ -271,10 +271,10 @@ max_css, max_lcss, max_chan); ret = filter(integer k, map<string, any> d, ret, { - list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); - integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); - integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); - integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + list<string> tmp_strs = splitstring(d["channel"]:"", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:""); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:""); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:""); return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; @@ -307,7 +307,7 @@ { integer ret = nil; foreach(integer index , map<string, any> d, devices, { - if (d["channel"]:"0.0.0000" == channel) + if (d["channel"]:"" == channel) ret = index; }); return ret; @@ -370,7 +370,7 @@ disks = filter (map<string, any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); disks = maplist (map<string,any> d, disks, { - string channel = d["sysfs_bus_id"]:"0.0.0000"; + string channel = d["sysfs_bus_id"]:""; d["channel"] = channel; boolean active = d["resource", "io", 0, "active"]:false; Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 20:23:40 2012 @@ -263,14 +263,14 @@ GetFilteredDevices() { list<string> min_strs = splitstring(filter_min, "."); - integer min_css = tointeger("0x" + min_strs[0]:"0"); - integer min_lcss = tointeger("0x" + min_strs[1]:"0"); - integer min_chan = tointeger("0x" + min_strs[2]:"0"); + integer min_css = tointeger("0x" + min_strs[0]:""); + integer min_lcss = tointeger("0x" + min_strs[1]:""); + integer min_chan = tointeger("0x" + min_strs[2]:""); list<string> max_strs = splitstring(filter_max, "."); - integer max_css = tointeger("0x" + max_strs[0]:"0"); - integer max_lcss = tointeger("0x" + max_strs[1]:"0"); - integer max_chan = tointeger("0x" + max_strs[2]:"0"); + integer max_css = tointeger("0x" + max_strs[0]:""); + integer max_lcss = tointeger("0x" + max_strs[1]:""); + integer max_chan = tointeger("0x" + max_strs[2]:""); map<integer, map<string, any> > ret = GetDevices(); @@ -281,10 +281,10 @@ max_css, max_lcss, max_chan); ret = filter(integer k, map<string, any> d, ret, { - list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); - integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); - integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); - integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + list<string> tmp_strs = splitstring(d["channel"]:"", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:""); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:""); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:""); return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; @@ -317,7 +317,7 @@ { integer ret = nil; foreach(integer index , map<string, any> d, devices, { - if (d["channel"]:"0.0.0000" == channel) + if (d["channel"]:"" == channel) ret = index; }); return ret; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 20:23:40 2012 @@ -44,6 +44,7 @@ return ret ? `next : `abort; } + /** * Write settings dialog * @return `abort if aborted and `next otherwise @@ -69,9 +70,9 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string channel = d["detail", "controller_id"]:"unknown"; - string wwpn = d["detail", "wwpn"]:"unknown"; - string fcp_lun = d["detail", "fcp_lun"]:"unknown"; + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; return `item(`id(k), channel, wwpn, fcp_lun); }); @@ -225,7 +226,7 @@ else { items = maplist (map<string, any> c, ZFCPController::GetControllers(), { - string channel = c["sysfs_bus_id"]:"0.0.0000"; + string channel = c["sysfs_bus_id"]:""; return channel; }); } @@ -266,16 +267,55 @@ { ret = (symbol) UI::UserInput(); - if (ret == `get_wwpn){ - list<string> items = ZFCPController::GetWWPNs((string)UI::QueryWidget(`channel, `Value)); - UI::ChangeWidget(`wwpn, `Items, items); - ret=nil; - } - else if (ret == `get_lun){ - list<string> items = ZFCPController::GetLUNs((string)UI::QueryWidget(`channel, `Value), (string)UI::QueryWidget(`wwpn, `Value)); - UI::ChangeWidget(`fcp_lun, `Items, items); - ret=nil; - } + if (ret == `get_wwpn) + { + string channel = (string) UI::QueryWidget(`channel, `Value); + + if (!ZFCPController::IsValidChannel(channel)) + { + // error popup + Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); + ret = nil; + continue; + } + + channel = ZFCPController::FormatChannel(channel); + + list<string> items = ZFCPController::GetWWPNs(channel); + UI::ChangeWidget(`wwpn, `Items, items); + ret = nil; + } + else if (ret == `get_lun) + { + string channel = (string) UI::QueryWidget(`channel, `Value); + string wwpn = (string) UI::QueryWidget(`wwpn, `Value); + + if (!ZFCPController::IsValidChannel(channel)) + { + // error popup + Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); + ret = nil; + continue; + } + + if (!ZFCPController::IsValidWWPN(wwpn)) + { + // error popup + Report::Error(_("The entered WWPN is invalid.")); + UI::SetFocus(`wwpn); + ret = nil; + continue; + } + + channel = ZFCPController::FormatChannel(channel); + wwpn = ZFCPController::FormatWWPN(wwpn); + + list<string> items = ZFCPController::GetLUNs(channel, wwpn); + UI::ChangeWidget(`fcp_lun, `Items, items); + ret = nil; + } else if (ret == `abort || ret == `cancel) { // yes-no popup @@ -378,16 +418,16 @@ { foreach(integer index, selected, { map d = ZFCPController::devices[index]:$[]; - string channel = d["detail", "controller_id"]:"unknown"; - string wwpn = d["detail", "wwpn"]:"unknown"; - string fcp_lun = d["detail", "fcp_lun"]:"unknown"; + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; ZFCPController::DeactivateDisk(channel, wwpn, fcp_lun); }); - + ZFCPController::ProbeDisks(); } } - + return `next; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67500 - /trunk/s390/src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 19:09:35 2012 New Revision: 67500 URL: http://svn.opensuse.org/viewcvs/yast?rev=67500&view=rev Log: - simplified UI layout Modified: trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 19:09:35 2012 @@ -112,9 +112,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `HBox( - `Table(`id(`table), `opt(`multiSelection), header, []) - ), + `Table(`id(`table), `opt(`multiSelection), header, []), `HBox( `PushButton(`id(`add), Label::AddButton ()), `PushButton(`id(`delete), Label::DeleteButton ()), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67499 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 19:04:06 2012 New Revision: 67499 URL: http://svn.opensuse.org/viewcvs/yast?rev=67499&view=rev Log: - improved logging Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 21 19:04:06 2012 @@ -410,7 +410,7 @@ return $[ index : d ]; }); - y2milestone("probed dasds %1", devices); + y2milestone("probed DASD devices %1", devices); UI::CloseDialog (); } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 19:04:06 2012 @@ -366,7 +366,8 @@ controllers = filter (map<string,any> c, controllers, { return c["device"]:"" == "zFCP controller"; }); - y2milestone ("Found %1 zfcp controllers", size (controllers)); + + y2milestone ("probed ZFCP controllers %1", controllers); } return controllers; } @@ -404,7 +405,7 @@ return $[ index : d ]; }); - y2milestone("probed zfcps %1", devices); + y2milestone("probed ZFCP devices %1", devices); UI::CloseDialog(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67498 - in /trunk/s390/src: modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 18:59:57 2012 New Revision: 67498 URL: http://svn.opensuse.org/viewcvs/yast?rev=67498&view=rev Log: - removed HexNumSize Modified: trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 18:59:57 2012 @@ -38,30 +38,6 @@ boolean disk_configured = false; -/** - * Update the size of hexa number via adding leading zeros - * @param hex string a hexa number (withou or without leading 0x) - * @param digits the count of digits (excluding leading 0x) - * @return hex string with specified length - */ -global string HexNumSize (string hex, integer digits) { - boolean leading0x = false; - if (substring (hex, 0, 2) == "0x") - { - leading0x = true; - hex = substring (hex, 2); - } - while (size (hex) < digits) - { - hex = "0" + hex; - } - if (leading0x) - { - hex = "0x" + hex; - } - return hex; -} - /** * Data was modified? @@ -592,7 +568,7 @@ } string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, - HexNumSize(wwpn, 16), HexNumSize(lun, 16), 1); + wwpn, lun, 1); y2milestone("Running command \"%1\"", command); integer ret = (integer) SCR::Execute(.target.bash, command); y2milestone("Command \"%1\" returned with exit code %2", command, ret); @@ -612,7 +588,7 @@ global void DeactivateDisk(string channel, string wwpn, string lun) { string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, - HexNumSize(wwpn, 16), HexNumSize(lun, 16), 0); + wwpn, lun, 0); y2milestone("Running command \"%1\"", command); integer ret = (integer) SCR::Execute(.target.bash, command); y2milestone("Command \"%1\" returned with exit code %2", command, ret); Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 18:59:57 2012 @@ -69,13 +69,9 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string dev_name = d["dev_name"]:""; string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; string fcp_lun = d["detail", "fcp_lun"]:"unknown"; - if (fcp_lun != "unknown") - fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); - return `item(`id(k), channel, wwpn, fcp_lun); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67497 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 18:56:56 2012 New Revision: 67497 URL: http://svn.opensuse.org/viewcvs/yast?rev=67497&view=rev Log: - added functions to format channel, wwpn and fcp-lun Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Tue Feb 21 18:56:56 2012 @@ -185,10 +185,8 @@ `Table(`id(`table), `opt(`multiSelection), header, []), Mode::config () ? `HBox ( - // push button - `PushButton (`id (`add), _("A&dd New Disk")), - // push button - `PushButton (`id (`delete), _("De&lete Disk")), + `PushButton(`id(`add), Label::AddButton()), + `PushButton(`id(`delete), Label::DeleteButton()), `HStretch () ) : `HBox ( @@ -241,7 +239,7 @@ string filter_min = (string) UI::QueryWidget(`min_chan, `Value); string filter_max = (string) UI::QueryWidget(`max_chan, `Value); - if (!DASDController::ValidChannel(filter_min) || !DASDController::ValidChannel(filter_max)) + if (!DASDController::IsValidChannel(filter_min) || !DASDController::IsValidChannel(filter_max)) { // error popup Popup::Error(_("Invalid filter channels.")); @@ -249,8 +247,8 @@ continue; } - DASDController::filter_min = filter_min; - DASDController::filter_max = filter_max; + DASDController::filter_min = DASDController::FormatChannel(filter_min); + DASDController::filter_max = DASDController::FormatChannel(filter_max); ReloadDASDDialog (); ret = nil; @@ -508,7 +506,7 @@ { string channel = (string) UI::QueryWidget(`id(`channel), `Value); - if (!DASDController::ValidChannel(channel)) + if (!DASDController::IsValidChannel(channel)) { // error popup Popup::Error(_("Not a valid channel.")); @@ -517,6 +515,8 @@ continue; } + channel = DASDController::FormatChannel(channel); + if (DASDController::GetDeviceIndex(channel) != nil) { // error popup @@ -534,6 +534,8 @@ boolean format = (boolean) UI::QueryWidget(`id(`format), `Value); boolean diag = (boolean) UI::QueryWidget(`id(`diag), `Value); + channel = DASDController::FormatChannel(channel); + map<string, any> d = $[ "channel" : channel, "format" : format, Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 21 18:56:56 2012 @@ -107,11 +107,21 @@ } - global boolean ValidChannel(string channel) + global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; return regexpmatch(channel, regexp); } + + global string FormatChannel(string channel) + { + if (!IsValidChannel(channel)) + return channel; + + list<string> strs = splitstring(channel, "."); + strs[2] = String::PadZeros(strs[2]:"", 4); + return mergestring(strs, "."); + } /** @@ -202,6 +212,8 @@ devices = listmap (map<string, any> d, settings["devices"]:[], { index = index + 1; + d["channel"] = FormatChannel(d["channel"]:""); + d = filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); }); Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 21 18:56:56 2012 @@ -16,6 +16,7 @@ import "Mode"; import "Report"; import "Popup"; + import "String"; global map<integer,map<string,any> > devices = $[]; @@ -116,24 +117,50 @@ } - global boolean ValidChannel(string channel) + global boolean IsValidChannel(string channel) { - string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{1,4})$"; return regexpmatch(channel, regexp); } - global boolean ValidWWPN(string wwpn) + global string FormatChannel(string channel) { - string regexp = "^0x([0-9a-fA-F]{16})$"; + if (!IsValidChannel(channel)) + return channel; + + list<string> strs = splitstring(channel, "."); + strs[2] = String::PadZeros(strs[2]:"", 4); + return mergestring(strs, "."); + } + + global boolean IsValidWWPN(string wwpn) + { + string regexp = "^0x([0-9a-fA-F]{1,16})$"; return regexpmatch(wwpn, regexp); } - global boolean ValidFCPLUN(string fcp_lun) + global string FormatWWPN(string wwpn) + { + if (!IsValidWWPN(wwpn)) + return wwpn; + + return tohexstring(tointeger(wwpn), 16); + } + + global boolean IsValidFCPLUN(string fcp_lun) { - string regexp = "^0x([0-9a-fA-F]{16})$"; + string regexp = "^0x([0-9a-fA-F]{1,16})$"; return regexpmatch(fcp_lun, regexp); } + global string FormatFCPLUN(string fcp_lun) + { + if (!IsValidFCPLUN(fcp_lun)) + return fcp_lun; + + return tohexstring(tointeger(fcp_lun), 16); + } + global string GetNextLUN(string fcp_lun) { @@ -219,9 +246,9 @@ index = index + 1; map<string, any> m = $[ "detail" : $[ - "controller_id" : d["controller_id"]:"", - "wwpn" : d["wwpn"]:"", - "fcp_lun" : d["fcp_lun"]:"", + "controller_id" : FormatChannel(d["controller_id"]:""), + "wwpn" : FormatWWPN(d["wwpn"]:""), + "fcp_lun" : FormatFCPLUN(d["fcp_lun"]:""), ], ]; return $[ index : m ]; Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Tue Feb 21 18:56:56 2012 @@ -168,7 +168,7 @@ string filter_min = (string) UI::QueryWidget(`min_chan, `Value); string filter_max = (string) UI::QueryWidget(`max_chan, `Value); - if (!ZFCPController::ValidChannel(filter_min) || !ZFCPController::ValidChannel(filter_max)) + if (!ZFCPController::IsValidChannel(filter_min) || !ZFCPController::IsValidChannel(filter_max)) { // error popup Popup::Error(_("Invalid filter channels.")); @@ -176,8 +176,8 @@ continue; } - ZFCPController::filter_min = filter_min; - ZFCPController::filter_max = filter_max; + ZFCPController::filter_min = ZFCPController::FormatChannel(filter_min); + ZFCPController::filter_max = ZFCPController::FormatChannel(filter_max); ReloadZFCPDialog(); ret = nil; @@ -297,7 +297,7 @@ string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); string fcp_lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); - if (!ZFCPController::ValidChannel(channel)) + if (!ZFCPController::IsValidChannel(channel)) { // error popup Popup::Error(_("Not a valid channel.")); @@ -306,7 +306,7 @@ continue; } - if (!ZFCPController::ValidWWPN(wwpn)) + if (!ZFCPController::IsValidWWPN(wwpn)) { // error popup Report::Error(_("The entered WWPN is invalid.")); @@ -315,7 +315,7 @@ continue; } - if (!ZFCPController::ValidFCPLUN(fcp_lun)) + if (!ZFCPController::IsValidFCPLUN(fcp_lun)) { // error popup Report::Error(_("The entered FCP-LUN is invalid.")); @@ -332,6 +332,10 @@ string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + channel = ZFCPController::FormatChannel(channel); + wwpn = ZFCPController::FormatWWPN(wwpn); + lun = ZFCPController::FormatFCPLUN(lun); + ZFCPController::previous_settings["channel"] = channel; ZFCPController::previous_settings["wwpn"] = wwpn; ZFCPController::previous_settings["fcp_lun"] = lun; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67496 - in /trunk/s390/src/clients: dasd_proposal.ycp inst_dasd.ycp inst_zfcp.ycp zfcp_proposal.ycp
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 14:42:09 2012 New Revision: 67496 URL: http://svn.opensuse.org/viewcvs/yast?rev=67496&view=rev Log: - use correct CloseDialog - cleanup Modified: trunk/s390/src/clients/dasd_proposal.ycp trunk/s390/src/clients/inst_dasd.ycp trunk/s390/src/clients/inst_zfcp.ycp trunk/s390/src/clients/zfcp_proposal.ycp Modified: trunk/s390/src/clients/dasd_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_proposal.y… ============================================================================== --- trunk/s390/src/clients/dasd_proposal.ycp (original) +++ trunk/s390/src/clients/dasd_proposal.ycp Tue Feb 21 14:42:09 2012 @@ -6,9 +6,7 @@ * * Proposal function dispatcher for dasd configuration. */ - { - textdomain "s390"; import "DASDController"; @@ -22,7 +20,7 @@ if ( func == "MakeProposal" ) { list summary = DASDController::Summary(); - if (size (summary) == 0) + if (isempty(summary)) // text for installation summary summary = [ _("No DASD disk detected") ]; // Fill return map @@ -37,7 +35,7 @@ { Wizard::CreateDialog (); any sequence = WFM::CallFunction ("inst_dasd", []); - UI::CloseDialog (); + Wizard::CloseDialog (); // Fill return map ret = $[ "workflow_sequence" : sequence @@ -63,7 +61,4 @@ } return ret; - -/* EOF */ } - Modified: trunk/s390/src/clients/inst_dasd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/inst_dasd.ycp?r… ============================================================================== --- trunk/s390/src/clients/inst_dasd.ycp (original) +++ trunk/s390/src/clients/inst_dasd.ycp Tue Feb 21 14:42:09 2012 @@ -8,33 +8,19 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("DASD installation module started"); include "s390/dasd/wizards.ycp"; -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -ret = MainDASDSequence (); +any ret = MainDASDSequence(); y2debug("ret=%1", ret); -/* Finish */ y2milestone("DASD installation module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/inst_zfcp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/inst_zfcp.ycp?r… ============================================================================== --- trunk/s390/src/clients/inst_zfcp.ycp (original) +++ trunk/s390/src/clients/inst_zfcp.ycp Tue Feb 21 14:42:09 2012 @@ -8,33 +8,19 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("ZFCP installation module started"); include "s390/zfcp/wizards.ycp"; -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -ret = MainZFCPSequence (); +any ret = MainZFCPSequence(); y2debug("ret=%1", ret); -/* Finish */ y2milestone("ZFCP module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/zfcp_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_proposal.y… ============================================================================== --- trunk/s390/src/clients/zfcp_proposal.ycp (original) +++ trunk/s390/src/clients/zfcp_proposal.ycp Tue Feb 21 14:42:09 2012 @@ -6,9 +6,7 @@ * * Proposal function dispatcher for zfcp configuration. */ - { - textdomain "s390"; import "ZFCPController"; @@ -22,7 +20,7 @@ if ( func == "MakeProposal" ) { list summary = ZFCPController::Summary(); - if (size (summary) == 0) + if (isempty(summary)) // text for installation summary summary = [ _("No zFCP device configured") ]; // Fill return map @@ -37,7 +35,7 @@ { Wizard::CreateDialog (); any sequence = WFM::CallFunction ("inst_zfcp", []); - UI::CloseDialog (); + Wizard::CloseDialog (); // Fill return map ret = $[ "workflow_sequence" : sequence @@ -63,7 +61,4 @@ } return ret; - -/* EOF */ } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67495 - /tags/stable-2_22_4/ldap-client/
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:30:52 2012 New Revision: 67495 URL: http://svn.opensuse.org/viewcvs/yast?rev=67495&view=rev Log: Created tag stable-2_22_4 for ldap-client Added: tags/stable-2_22_4/ldap-client/ - copied from r67494, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67494 - /trunk/ncurses-pkg/src/NCPkgPackageDetails.cc
by gs＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: gs Date: Tue Feb 21 11:30:03 2012 New Revision: 67494 URL: http://svn.opensuse.org/viewcvs/yast?rev=67494&view=rev Log: also create html paragraphs when showing package description Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Tue Feb 21 11:30:03 2012 @@ -123,7 +123,7 @@ text += pkgPtr->description(); // show the description - setValue( text ); + setValue( createHtmlParagraphs(text) ); } void NCPkgPackageDetails::technicalData( ZyppObj pkgPtr, ZyppSel slbPtr ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67493 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:28:15 2012 New Revision: 67493 URL: http://svn.opensuse.org/viewcvs/yast?rev=67493&view=rev Log: - removed password policies configuration from client, relevant parts moved to server configuration (fate #313143) - 2.22.4 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67493&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Tue Feb 21 11:28:15 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Tue Feb 21 11:28:15 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 21 11:06:29 CET 2012 - jsuchome(a)suse.cz + +- removed password policies configuration from client, relevant parts + moved to server configuration (fate #313143) +- 2.22.4 + +------------------------------------------------------------------- Thu Feb 2 15:00:26 CET 2012 - jsuchome(a)suse.cz - removed option to switch off TLS/SSL from UI -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67492 - in /trunk: ldap-client/src/LdapPopup.ycp ldap-server/package/yast2-ldap-server.changes ldap-server/src/LdapDatabase.ycp ldap-server/src/widgets.ycp
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:26:43 2012 New Revision: 67492 URL: http://svn.opensuse.org/viewcvs/yast?rev=67492&view=rev Log: PasswordPolicyDialog moved from ldap-client to ldap-server Modified: trunk/ldap-client/src/LdapPopup.ycp trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-client/src/LdapPopup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/LdapPopup.ycp?re… ============================================================================== --- trunk/ldap-client/src/LdapPopup.ycp (original) +++ trunk/ldap-client/src/LdapPopup.ycp Tue Feb 21 11:26:43 2012 @@ -566,371 +566,4 @@ return $[ "attr": attr, "value": new_value ]; } -/** - * dialog for Password Policy configuration object - * @param ppolicy data with Password Policy object to be edited (as obtained from LDAP search) - * @return map with modifications of ppolicy object, nil in case of `cancel - */ -global define map PasswordPolicyDialog (map ppolicy) { - - // reduce the list values to single ones - ppolicy = mapmap (string a, any val, (map<string,any>)ppolicy, { - if (is (val, list) && (Ldap::SingleValued (a) || size ((list)val) == 1)) - val = ((list)val)[0]:nil; - if (val == "TRUE" || val == "FALSE") - val = (val == "TRUE"); - return $[ a: val ]; - }); - map ppolicy_orig = ppolicy; - - // help text for Password Policy Dialog - string help_text = _("Select the Password Change Policies, Password Aging Policies, and Lockout Policies tabs to choose LDAP password policy groups of attributes to configure."); - - - // tab-specific help texts - map tabs_help_text = $[ - // help text for pwdInHistory attribute - `pwchange : _("Specify the Maximum Number of Passwords Stored in History to set how many previously used passwords should be saved. Saved passwords may not be used.") + - - // help text for pwdMustChange attribute - _("Check User Must Change Password after Reset to force users to change their passwords after the password is reset or changed by an administrator.") + - - // help text for pwdAllowUserChange attribute - _("Check User Can Change Password to allow users to change their passwords.") + - - // help text for pwdSafeModify attribute - _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + - - // help text for pwdCheckQuality attribute - _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be evaluated. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user provides an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + - - // help text for pwdMinLength attribute - _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), - - // help text for pwdMinAge attribute - `aging : _("Minimum Password Age sets how much time must pass between modifications to the password.") + - - // help text for pwdMaxAge attribute - _("Maximum Password Age sets how long after modification a password expires.") + - - // help text for pwdExpireWarning attribute - _("In Time before Password Expiration to Issue Warning specify how long\nbefore expiration an authenticating user should be warned.") + - - // help text for pwdGraceAuthNLimit attribute - _("Set the number of times an expired password can be used to authenticate in Allowed Uses of an Expired Password."), - - // help text for pwdLockout attribute - `lockout : _("Check Enable Password Locking to forbid use of a password after a specified number of consecutive failed bind attempts.") + - - // help text for pwdMaxFailure attribute - _("Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in Bind Failures to Lock the Password.") + - - // help text for pwdLockoutDuration attribute - _("Set for how long the password cannot be used in Password Lock Duration.") + - - // help text for pwdFailureCountInterval attribute - _("Bind Failures Cache Duration specifies the time after which password failures are purged from the failure counter even if no successful authentication has occurred."), - ]; - - // map of attribute names for each tab - map attributes = $[ - `pwchange : [ - "pwdInHistory", "pwdMustChange", "pwdAllowUserChange", - "pwdSafeModify", "pwdCheckQuality", "pwdMinLength" - ], - `aging : [ - "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdGraceAuthNLimit" - ], - `lockout : [ - "pwdLockout", "pwdLockoutDuration", "pwdMaxFailure", - "pwdFailureCountInterval" - ], - ]; - - list time_attributes = [ - "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdLockoutDuration", - "pwdFailureCountInterval" - ]; - - map default_values = $[ - "pwdMustChange" : false, - "pwdAllowUserChange" : true, - "pwdSafeModify" : false, - "pwdLockout" : false, - ]; - - // maximal value of IntFields - integer max = 99999; - - list<term> tabs = [ - // tab label - `item(`id(`pwchange), _("&Password Change Policies"), true), - // tab label - `item(`id(`aging), _("Pa&ssword Aging Policies")), - // tab label - `item(`id(`lockout), _("&Lockout Policies")), - ]; - term tabs_term = `VBox ( - `DumbTab (`id(`tabs), tabs, - `ReplacePoint(`id(`tabContents ), `VBox (`Empty ()))) - ); - boolean has_tabs = true; - if (!UI::HasSpecialWidget (`DumbTab)) - { - has_tabs = false; - term tabbar = `HBox (); - foreach (term it, tabs, { - string label = it[1]:""; - tabbar = add (tabbar,`PushButton (it[0]:`id(label), label)); - }); - tabs_term = `VBox (`Left(tabbar), - `Frame ("", `ReplacePoint(`id(`tabContents), `Empty ())) - ); - } - - term contents = tabs_term; - - // generate the term of password policy tab and update the help text - void set_password_policies_term () { - integer pwdcheckquality = tointeger (ppolicy["pwdCheckQuality"]:"0"); - term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( - `VSpacing (0.8), - `IntField (`id ("pwdInHistory"), - // IntField label - _("Ma&ximum Number of Passwords Stored in History"), - 0, max, tointeger (ppolicy["pwdInHistory"]:"0")), - `VSpacing (0.4), - `Left (`CheckBox (`id ("pwdMustChange"), - // checkbox label - _("U&ser Must Change Password after Reset"), - ppolicy["pwdMustChange"]:true)), - `VSpacing (0.2), - `Left (`CheckBox (`id ("pwdAllowUserChange"), - // checkbox label - _("&User Can Change Password"), - ppolicy["pwdAllowUserChange"]:true)), - `VSpacing (0.2), - `Left (`CheckBox (`id ("pwdSafeModify"), - // checkbox label - _("&Old Password Required for Password Change"), - ppolicy["pwdSafeModify"]:false)), - `VSpacing (0.4), - // frame label - `HBox (`HSpacing (2), `Frame (_("Password Quality Checking"), `VBox( - `VSpacing (0.5), - `RadioButtonGroup (`id("pwdCheckQuality"), `VBox ( - `Left (`RadioButton (`id(0), `opt (`notify), - _("&No Checking"), pwdcheckquality == 0)), - `Left (`RadioButton(`id(1), `opt (`notify), - _("Acc&ept Uncheckable Passwords"), - pwdcheckquality == 1)), - `Left (`RadioButton(`id(2), `opt (`notify), - _("&Only Accept Checked Passwords"), - pwdcheckquality == 2)) - )), - `VSpacing (0.4), - // IntField label - `IntField (`id ("pwdMinLength"), _("&Minimum Password Length"), - 0, max, tointeger (ppolicy["pwdMinLength"]:"0")) - ))) - ), `HSpacing (0.5))); - - UI::ReplaceWidget (`tabContents, tab_cont); - UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, pwdcheckquality > 0); - return; - } - - term time_dialog (string id, string label) { - - integer value = tointeger (ppolicy[id]:"0"); - integer days = value / (24*60*60); - if (days > 0) value = value - (days * 24*60*60); - integer hours = value / (60*60); - if (hours > 0) value = value - (hours * 60*60); - integer minutes = value / 60; - if (minutes > 0) value = value - (minutes * 60); - return `HBox (`HSpacing (0.3), `Frame (label, `HBox ( - `IntField (`id (id + "d"), _("Days"), 0, max, days), - `IntField (`id (id + "h"), _("Hours"), 0, 23, hours), - `IntField (`id (id + "m"), _("Minutes"), 0, 59, minutes), - `IntField (`id (id + "s"), _("Seconds"), 0, 59, value) - )), `HSpacing (0.3)); - } - - integer get_seconds_value (string attr) { - - integer days = (integer) UI::QueryWidget (`id (attr + "d"), `Value); - integer hours = (integer) UI::QueryWidget (`id (attr + "h"), `Value); - integer minutes = (integer) UI::QueryWidget (`id (attr + "m"), `Value); - integer seconds = (integer) UI::QueryWidget (`id (attr + "s"), `Value); - return (days * 24*60*60) + (hours * 60*60) + (minutes *60) + seconds; - } - - // generate the term of password aging tab - void set_aging_policies_term () { - - term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( - `VSpacing (0.7), - // frame label - time_dialog ("pwdMinAge", _("Minimum Password Age")), - `VSpacing (0.4), - // frame label - time_dialog ("pwdMaxAge", _("Maximum Password Age")), - `VSpacing (0.4), - time_dialog ("pwdExpireWarning", - // frame label - _("Time before Password Expiration to Issue Warning")), - `VSpacing (0.2), - `IntField (`id ("pwdGraceAuthNLimit"), - // IntField label - _("Allowed Use of an Expired Password"), 0, max, - tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") - ) - ), `HSpacing (0.5))); - UI::ReplaceWidget (`tabContents, tab_cont); - return; - } - - // generate the term of lockout aging tab - void set_lockout_policies_term () { - - boolean pwdlockout = ppolicy["pwdLockout"]:false; - - term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( - `VSpacing (0.8), - `Left (`CheckBox (`id ("pwdLockout"), `opt (`notify), - // check box label - _("Enable Password Locking"), - pwdlockout)), - `VSpacing (0.4), - `IntField (`id ("pwdMaxFailure"), - // intField label - _("Bind Failures to Lock the Password"), - 0, max, tointeger (ppolicy["pwdMaxFailure"]:"0")), - // frame label - time_dialog ("pwdLockoutDuration", _("Password Lock Duration")), - `VSpacing (0.4), - time_dialog ("pwdFailureCountInterval", - // frame label - _("Bind Failures Cache Duration")) - ), `HSpacing (0.5))); - - UI::ReplaceWidget (`tabContents, tab_cont); - UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); - foreach (string suffix, [ "d", "h", "m", "s" ], { - UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), - `Enabled, pwdlockout); - UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), - `Enabled, pwdlockout); - }); - return; - } - - symbol current_tab = `pwchange; - any result = nil; - - Wizard::OpenNextBackDialog (); - - // dialog label - Wizard::SetContentsButtons (_("Password Policy Configuration"), contents, - help_text + tabs_help_text[current_tab]:"", - Label::CancelButton(), Label::OKButton()); - Wizard::HideAbortButton(); - - set_password_policies_term (); - - while (true) - { - result = UI::UserInput (); - - if (is(result,symbol) && - contains ([`back, `cancel, `abort], (symbol)result)) - break; - - // save the values from UI - foreach (string attr, attributes[current_tab]:[], { - if (contains (time_attributes, attr)) - { - ppolicy[attr] = sformat ("%1", get_seconds_value (attr)); - return; - } - any val = UI::QueryWidget (`id (attr), `Value); - if (is (val, integer)) - val = sformat ("%1", val); - ppolicy[attr] = val; - }); - - if ((result == `pwchange || result == `aging || result == `lockout) && - result!= current_tab) - { - if (result == `pwchange) - set_password_policies_term (); - else if (result == `aging) - set_aging_policies_term (); - else if (result == `lockout) - set_lockout_policies_term (); - current_tab = (symbol) result; - if (has_tabs) - UI::ChangeWidget (`id (`tabs), `CurrentItem, current_tab); - Wizard::SetHelpText (help_text + tabs_help_text[current_tab]:""); - continue; - } - if (result == `next) - { - boolean cont = false; - - // check the template required attributes... - foreach (string oc, ppolicy["objectClass"]:[], ``{ - if (cont) return; - foreach (string attr, Ldap::GetRequiredAttributes (oc), ``{ - any val = ppolicy[attr]:nil; - if (!cont && val == nil || val == [] || val == "") { - //error popup, %1 is attribute name - Popup::Error (sformat (_("The \"%1\" attribute is mandatory. -Enter a value."), attr)); - UI::SetFocus (`id(`table)); - cont = true; - } - }); - }); - if (cont) continue; - break; - } - // now solve events inside the tabs - if (current_tab == `pwchange && is (result, integer)) - { - UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, result != 0); - } - if (current_tab == `lockout && result == "pwdLockout") - { - boolean pwdlockout = (boolean) UI::QueryWidget (`id ("pwdLockout"), `Value); - UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); - foreach (string suffix, [ "d", "h", "m", "s" ], { - UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), - `Enabled, pwdlockout); - UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), - `Enabled, pwdlockout); - }); - } - } - Wizard::CloseDialog (); - - map<string,any> ret = $[]; - if (result == `next) - { - foreach (string key, any val, (map<string,any>) ppolicy, { - if (!haskey (ppolicy_orig, key) && - (val == default_values[key]:nil || val == "0")) - return; - if (val != ppolicy_orig[key]:nil) - { - if (is (val, boolean)) - val = (val == true) ? "TRUE" : "FALSE"; - ret[key] = val; - } - }); - } - return (result == `next) ? ret : nil; -} - }//EOF Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Tue Feb 21 11:26:43 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 21 11:25:21 CET 2012 - jsuchome(a)suse.cz + +- password policy popup moved here from ldap-client module + (fate#313143) + +------------------------------------------------------------------- Wed Dec 7 10:05:50 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp… ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Tue Feb 21 11:26:43 2012 @@ -9,7 +9,9 @@ import "Sequencer"; import "String"; import "Wizard"; - include "helps.ycp"; + + include "ldap-server/helps.ycp"; + include "ldap-server/widgets.ycp"; map <string, any> baseDb = $[ "rootdn" : "cn=Administrator", "directory" : "/var/lib/ldap" ]; @@ -557,7 +559,7 @@ } } } - map ppolicyEntry_new = LdapPopup::PasswordPolicyDialog(ppolicyEntry); + map ppolicyEntry_new = PasswordPolicyDialog(ppolicyEntry); // PasswordPolicyDialog only returns the changes made to the original // Entry, try to merge them here foreach ( string key, any val, (map<string,any>) ppolicyEntry_new, Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Tue Feb 21 11:26:43 2012 @@ -3,7 +3,9 @@ textdomain "ldap-server"; import "CWMFirewallInterfaces"; import "Label"; + import "Ldap"; import "Popup"; + import "Wizard"; map<string, any> firewall_settings = $[ "services": [ "service:openldap" ], @@ -493,4 +495,372 @@ return retval; } +/** + * dialog for Password Policy configuration object + * @param ppolicy data with Password Policy object to be edited (as obtained from LDAP search) + * @return map with modifications of ppolicy object, nil in case of `cancel + */ +define map PasswordPolicyDialog (map ppolicy) { + + // reduce the list values to single ones + ppolicy = mapmap (string a, any val, (map<string,any>)ppolicy, { + if (is (val, list) && (Ldap::SingleValued (a) || size ((list)val) == 1)) + val = ((list)val)[0]:nil; + if (val == "TRUE" || val == "FALSE") + val = (val == "TRUE"); + return $[ a: val ]; + }); + map ppolicy_orig = ppolicy; + + // help text for Password Policy Dialog + string help_text = _("Select the Password Change Policies, Password Aging Policies, and Lockout Policies tabs to choose LDAP password policy groups of attributes to configure."); + + + // tab-specific help texts + map tabs_help_text = $[ + // help text for pwdInHistory attribute + `pwchange : _("Specify the Maximum Number of Passwords Stored in History to set how many previously used passwords should be saved. Saved passwords may not be used.") + + + // help text for pwdMustChange attribute + _("Check User Must Change Password after Reset to force users to change their passwords after the password is reset or changed by an administrator.") + + + // help text for pwdAllowUserChange attribute + _("Check User Can Change Password to allow users to change their passwords.") + + + // help text for pwdSafeModify attribute + _("If the existing password must be provided along with the new password, check Old Password Required for Password Change.") + + + // help text for pwdCheckQuality attribute + _("Select whether the password quality should be verified while passwords are modified or added. Select No Checking if passwords should not be evaluated. With Accept Uncheckable Passwords, passwords are accepted even if the check cannot be performed, for example, if the user provides an encrypted password. With Only Accept Checked Passwords passwords are refused if the quality test fails or the password cannot be checked.") + + + // help text for pwdMinLength attribute + _("Set the minimum number of characters that must be used in a password in Minimum Password Length."), + + // help text for pwdMinAge attribute + `aging : _("Minimum Password Age sets how much time must pass between modifications to the password.") + + + // help text for pwdMaxAge attribute + _("Maximum Password Age sets how long after modification a password expires.") + + + // help text for pwdExpireWarning attribute + _("In Time before Password Expiration to Issue Warning specify how long\nbefore expiration an authenticating user should be warned.") + + + // help text for pwdGraceAuthNLimit attribute + _("Set the number of times an expired password can be used to authenticate in Allowed Uses of an Expired Password."), + + // help text for pwdLockout attribute + `lockout : _("Check Enable Password Locking to forbid use of a password after a specified number of consecutive failed bind attempts.") + + + // help text for pwdMaxFailure attribute + _("Set the number of consecutive failed bind attempts after which the password may not be used to authenticate in Bind Failures to Lock the Password.") + + + // help text for pwdLockoutDuration attribute + _("Set for how long the password cannot be used in Password Lock Duration.") + + + // help text for pwdFailureCountInterval attribute + _("Bind Failures Cache Duration specifies the time after which password failures are purged from the failure counter even if no successful authentication has occurred."), + ]; + + // map of attribute names for each tab + map attributes = $[ + `pwchange : [ + "pwdInHistory", "pwdMustChange", "pwdAllowUserChange", + "pwdSafeModify", "pwdCheckQuality", "pwdMinLength" + ], + `aging : [ + "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdGraceAuthNLimit" + ], + `lockout : [ + "pwdLockout", "pwdLockoutDuration", "pwdMaxFailure", + "pwdFailureCountInterval" + ], + ]; + + list time_attributes = [ + "pwdMinAge", "pwdMaxAge", "pwdExpireWarning", "pwdLockoutDuration", + "pwdFailureCountInterval" + ]; + + map default_values = $[ + "pwdMustChange" : false, + "pwdAllowUserChange" : true, + "pwdSafeModify" : false, + "pwdLockout" : false, + ]; + + // maximal value of IntFields + integer max = 99999; + + list<term> tabs = [ + // tab label + `item(`id(`pwchange), _("&Password Change Policies"), true), + // tab label + `item(`id(`aging), _("Pa&ssword Aging Policies")), + // tab label + `item(`id(`lockout), _("&Lockout Policies")), + ]; + term tabs_term = `VBox ( + `DumbTab (`id(`tabs), tabs, + `ReplacePoint(`id(`tabContents ), `VBox (`Empty ()))) + ); + boolean has_tabs = true; + if (!UI::HasSpecialWidget (`DumbTab)) + { + has_tabs = false; + term tabbar = `HBox (); + foreach (term it, tabs, { + string label = it[1]:""; + tabbar = add (tabbar,`PushButton (it[0]:`id(label), label)); + }); + tabs_term = `VBox (`Left(tabbar), + `Frame ("", `ReplacePoint(`id(`tabContents), `Empty ())) + ); + } + + term contents = tabs_term; + + // generate the term of password policy tab and update the help text + void set_password_policies_term () { + integer pwdcheckquality = tointeger (ppolicy["pwdCheckQuality"]:"0"); + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.8), + `IntField (`id ("pwdInHistory"), + // IntField label + _("Ma&ximum Number of Passwords Stored in History"), + 0, max, tointeger (ppolicy["pwdInHistory"]:"0")), + `VSpacing (0.4), + `Left (`CheckBox (`id ("pwdMustChange"), + // checkbox label + _("U&ser Must Change Password after Reset"), + ppolicy["pwdMustChange"]:true)), + `VSpacing (0.2), + `Left (`CheckBox (`id ("pwdAllowUserChange"), + // checkbox label + _("&User Can Change Password"), + ppolicy["pwdAllowUserChange"]:true)), + `VSpacing (0.2), + `Left (`CheckBox (`id ("pwdSafeModify"), + // checkbox label + _("&Old Password Required for Password Change"), + ppolicy["pwdSafeModify"]:false)), + `VSpacing (0.4), + // frame label + `HBox (`HSpacing (2), `Frame (_("Password Quality Checking"), `VBox( + `VSpacing (0.5), + `RadioButtonGroup (`id("pwdCheckQuality"), `VBox ( + `Left (`RadioButton (`id(0), `opt (`notify), + _("&No Checking"), pwdcheckquality == 0)), + `Left (`RadioButton(`id(1), `opt (`notify), + _("Acc&ept Uncheckable Passwords"), + pwdcheckquality == 1)), + `Left (`RadioButton(`id(2), `opt (`notify), + _("&Only Accept Checked Passwords"), + pwdcheckquality == 2)) + )), + `VSpacing (0.4), + // IntField label + `IntField (`id ("pwdMinLength"), _("&Minimum Password Length"), + 0, max, tointeger (ppolicy["pwdMinLength"]:"0")) + ))) + ), `HSpacing (0.5))); + + UI::ReplaceWidget (`tabContents, tab_cont); + UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, pwdcheckquality > 0); + return; + } + + term time_dialog (string id, string label) { + + integer value = tointeger (ppolicy[id]:"0"); + integer days = value / (24*60*60); + if (days > 0) value = value - (days * 24*60*60); + integer hours = value / (60*60); + if (hours > 0) value = value - (hours * 60*60); + integer minutes = value / 60; + if (minutes > 0) value = value - (minutes * 60); + return `HBox (`HSpacing (0.3), `Frame (label, `HBox ( + `IntField (`id (id + "d"), _("Days"), 0, max, days), + `IntField (`id (id + "h"), _("Hours"), 0, 23, hours), + `IntField (`id (id + "m"), _("Minutes"), 0, 59, minutes), + `IntField (`id (id + "s"), _("Seconds"), 0, 59, value) + )), `HSpacing (0.3)); + } + + integer get_seconds_value (string attr) { + + integer days = (integer) UI::QueryWidget (`id (attr + "d"), `Value); + integer hours = (integer) UI::QueryWidget (`id (attr + "h"), `Value); + integer minutes = (integer) UI::QueryWidget (`id (attr + "m"), `Value); + integer seconds = (integer) UI::QueryWidget (`id (attr + "s"), `Value); + return (days * 24*60*60) + (hours * 60*60) + (minutes *60) + seconds; + } + + // generate the term of password aging tab + void set_aging_policies_term () { + + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.7), + // frame label + time_dialog ("pwdMinAge", _("Minimum Password Age")), + `VSpacing (0.4), + // frame label + time_dialog ("pwdMaxAge", _("Maximum Password Age")), + `VSpacing (0.4), + time_dialog ("pwdExpireWarning", + // frame label + _("Time before Password Expiration to Issue Warning")), + `VSpacing (0.2), + `IntField (`id ("pwdGraceAuthNLimit"), + // IntField label + _("Allowed Use of an Expired Password"), 0, max, + tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") + ) + ), `HSpacing (0.5))); + UI::ReplaceWidget (`tabContents, tab_cont); + return; + } + + // generate the term of lockout aging tab + void set_lockout_policies_term () { + + boolean pwdlockout = ppolicy["pwdLockout"]:false; + + term tab_cont = `Top (`HBox (`HSpacing (0.5), `VBox ( + `VSpacing (0.8), + `Left (`CheckBox (`id ("pwdLockout"), `opt (`notify), + // check box label + _("Enable Password Locking"), + pwdlockout)), + `VSpacing (0.4), + `IntField (`id ("pwdMaxFailure"), + // intField label + _("Bind Failures to Lock the Password"), + 0, max, tointeger (ppolicy["pwdMaxFailure"]:"0")), + // frame label + time_dialog ("pwdLockoutDuration", _("Password Lock Duration")), + `VSpacing (0.4), + time_dialog ("pwdFailureCountInterval", + // frame label + _("Bind Failures Cache Duration")) + ), `HSpacing (0.5))); + + UI::ReplaceWidget (`tabContents, tab_cont); + UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); + foreach (string suffix, [ "d", "h", "m", "s" ], { + UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), + `Enabled, pwdlockout); + UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), + `Enabled, pwdlockout); + }); + return; + } + + symbol current_tab = `pwchange; + any result = nil; + + Wizard::OpenNextBackDialog (); + + // dialog label + Wizard::SetContentsButtons (_("Password Policy Configuration"), contents, + help_text + tabs_help_text[current_tab]:"", + Label::CancelButton(), Label::OKButton()); + Wizard::HideAbortButton(); + + set_password_policies_term (); + + while (true) + { + result = UI::UserInput (); + + if (is(result,symbol) && + contains ([`back, `cancel, `abort], (symbol)result)) + break; + + // save the values from UI + foreach (string attr, attributes[current_tab]:[], { + if (contains (time_attributes, attr)) + { + ppolicy[attr] = sformat ("%1", get_seconds_value (attr)); + return; + } + any val = UI::QueryWidget (`id (attr), `Value); + if (is (val, integer)) + val = sformat ("%1", val); + ppolicy[attr] = val; + }); + + if ((result == `pwchange || result == `aging || result == `lockout) && + result!= current_tab) + { + if (result == `pwchange) + set_password_policies_term (); + else if (result == `aging) + set_aging_policies_term (); + else if (result == `lockout) + set_lockout_policies_term (); + current_tab = (symbol) result; + if (has_tabs) + UI::ChangeWidget (`id (`tabs), `CurrentItem, current_tab); + Wizard::SetHelpText (help_text + tabs_help_text[current_tab]:""); + continue; + } + if (result == `next) + { + boolean cont = false; + + // check the template required attributes... + foreach (string oc, ppolicy["objectClass"]:[], ``{ + if (cont) return; + foreach (string attr, Ldap::GetRequiredAttributes (oc), ``{ + any val = ppolicy[attr]:nil; + if (!cont && val == nil || val == [] || val == "") { + //error popup, %1 is attribute name + Popup::Error (sformat (_("The \"%1\" attribute is mandatory. +Enter a value."), attr)); + UI::SetFocus (`id(`table)); + cont = true; + } + }); + }); + if (cont) continue; + break; + } + // now solve events inside the tabs + if (current_tab == `pwchange && is (result, integer)) + { + UI::ChangeWidget (`id ("pwdMinLength"), `Enabled, result != 0); + } + if (current_tab == `lockout && result == "pwdLockout") + { + boolean pwdlockout = (boolean) UI::QueryWidget (`id ("pwdLockout"), `Value); + UI::ChangeWidget (`id ("pwdMaxFailure"), `Enabled, pwdlockout); + foreach (string suffix, [ "d", "h", "m", "s" ], { + UI::ChangeWidget (`id ("pwdFailureCountInterval" + suffix), + `Enabled, pwdlockout); + UI::ChangeWidget (`id ("pwdLockoutDuration" + suffix), + `Enabled, pwdlockout); + }); + } + } + Wizard::CloseDialog (); + + map<string,any> ret = $[]; + if (result == `next) + { + foreach (string key, any val, (map<string,any>) ppolicy, { + if (!haskey (ppolicy_orig, key) && + (val == default_values[key]:nil || val == "0")) + return; + if (val != ppolicy_orig[key]:nil) + { + if (is (val, boolean)) + val = (val == true) ? "TRUE" : "FALSE"; + ret[key] = val; + } + }); + } + return (result == `next) ? ret : nil; +} + + } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67491 - in /trunk/ldap-client/src: Ldap.ycp ui.ycp
by jsuchome＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: jsuchome Date: Tue Feb 21 11:06:24 2012 New Revision: 67491 URL: http://svn.opensuse.org/viewcvs/yast?rev=67491&view=rev Log: remove password policies configuration from the client (fate#313143) Modified: trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=674… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Tue Feb 21 11:06:24 2012 @@ -312,9 +312,6 @@ */ global boolean mkhomedir = false; - // map with modifications of Password Policies objects - global map<string,map> ppolicies = $[]; - // packages needed for pam_ldap/nss_ldap configuration global list<string> pam_nss_packages = ["pam_ldap", "nss_ldap"]; @@ -3035,12 +3032,6 @@ ldap_modified = false; } } - if (ppolicies != $[]) - { - WriteLDAP (ppolicies); - modified = true; // so data get reset in next step - ppolicies = $[]; - } // final stage Progress::NextStage (); Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67491… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Tue Feb 21 11:06:24 2012 @@ -55,7 +55,7 @@ define boolean Modified () ``{ - return (Ldap::modified || Ldap::ldap_modified || Ldap::ppolicies != $[]); + return (Ldap::modified || Ldap::ldap_modified); } /** @@ -786,14 +786,6 @@ check the appropriate option. Changing this value does not cause any direct action. It is only information for the YaST users module, which manages user home directories. -") + - - // password policy help text caption - _("Password Policy") + - - // password policy help - _("Configure the selected password policy with Edit. Use Add to -add a new password policy. Password policies must be enabled on the LDAP server. ") ]; @@ -847,64 +839,6 @@ "rfc2307bis" ]; - list ppolicy_list = []; - - boolean ppolicies_enabled = false; - map<string,map> ppolicies = $[]; - map<string,map> ppolicies_orig= $[]; - list<string> ppolicies_deleted = []; // list of DN - - // read the list of pwdpolicy objects under base_config_dn - void read_ppolicies () { - - if (base_dn == "") return; - - if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) - { - Ldap::LDAPClose (); - } - - if (Ldap::ldap_initialized || Ldap::LDAPInit () == "") - { - ppolicies_enabled = (boolean) SCR::Execute (.ldap.ppolicy, $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "bind_dn" : Ldap::GetBaseDN () - ]); - - list schemas = (list)SCR::Read (.ldap.search, $[ - "base_dn": "", - "attrs": [ "subschemaSubentry" ], - "scope": 0, - ]); - string schema_dn = schemas[0,"subschemaSubentry",0]:""; - if (schemas != nil && schema_dn != "" && - SCR::Execute (.ldap.schema, $[ "schema_dn": schema_dn ])== true) - { - map<string,map> pp = (map<string,map>) SCR::Read (.ldap.search, - $[ - "base_dn" : base_dn, - "filter" : "objectClass=pwdPolicy", - "scope" : 2, - "map" : true, - "not_found_ok" : true - ]); - if (pp != nil) - { - ppolicies = pp; - ppolicies_orig = ppolicies; - } - } - } - // TODO re-read is not supported, is it correct? - foreach (string dn, map ppolicy, Ldap::ppolicies, { - if (ppolicy["modified"]:"" == "deleted" && haskey (ppolicies, dn)) - ppolicies = remove (ppolicies, dn); - else if (ppolicy["modified"]:"" == "added") - ppolicies[dn] = ppolicy; - else ppolicies[dn] = union (ppolicies[dn]:$[], ppolicy); - }); - } - list<term> tabs = [ // tab label `item(`id(`client), _("C&lient Settings"), true), @@ -1026,19 +960,7 @@ `Right (`PushButton (`id(`configure), // pushbutton label _("Configure User Management &Settings..."))), - `VSpacing (), - `Table (`id (`ppolicy_table), `opt(`notify), `header ( - // table header - _("Password Policy")), - maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) - ), - `HBox ( - `PushButton (`id (`add), Label::AddButton ()), - `PushButton (`id (`edit), Label::EditButton ()), - `PushButton (`id (`delete), Label::DeleteButton ()), - `HStretch () - ), - `VSpacing(0.4) + `VStretch () ), `HSpacing (4)); UI::ReplaceWidget (`tabContents, cont); @@ -1049,9 +971,6 @@ if (Mode::config ()) UI::ChangeWidget (`id(`configure), `Enabled, false); - foreach (symbol s, [ `ppolicy_table, `add, `edit, `delete ], { - UI::ChangeWidget (`id (s), `Enabled, ppolicies_enabled); - }); } @@ -1065,7 +984,6 @@ symbol current = `client; set_client_term (); - read_ppolicies (); while (true) { @@ -1146,105 +1064,6 @@ UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); } - if (result == `add) - { - string suffix = base_dn; - UI::OpenDialog ( `opt(`decorated), `HBox( - `HSpacing(1), - `VBox( - // InputField label - `InputField (`id (`cn), `opt (`hstretch), - _("Name of Password Policy Object")), - `ReplacePoint (`id (`rp_suf), `HBox ( - // text label,suffix will follow in next label - `Label (`id (`suffix_label), _("Suffix:")), - `Label (`id (`suffix), base_dn), - // pushbutton label - `PushButton (`id (`br_suf), _("Change Suffix")) - )), - `ButtonBox ( - `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), - `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()) - ) - ), - `HSpacing(1) - )); - UI::SetFocus (`id (`cn)); - any ret = nil; - string new_dn = ""; - while (true) - { - ret = UI::UserInput (); - if (ret == `cancel) - break; - if (ret == `br_suf) - { - string suf = LdapPopup::InitAndBrowseTree (base_dn, $[ - "hostname" : Ldap::GetFirstServer (Ldap::server), - "port" : Ldap::GetFirstPort (Ldap::server), - "use_tls" : Ldap::ldap_tls ? "yes" : "no", - "cacertdir" : Ldap::tls_cacertdir, - "cacertfile" : Ldap::tls_cacertfile - ]); - if (suf != "") - UI::ReplaceWidget (`id (`rp_suf), `HBox ( - // text label,suffix will follow in next label - `Label (`id (`suffix_label), _("Suffix:")), - `Label (`id (`suffix), suf), - // pushbutton label - `PushButton (`id (`br_suf), _("Change Suffix")) - )); - } - if (ret == `ok) - { - string cn = (string) UI::QueryWidget (`id (`cn), `Value); - if (cn == "") break; - string suffix = (string) UI::QueryWidget (`id (`suffix), `Value); - new_dn = sformat ("cn=%1,%2", cn, suffix); - if (haskey (ppolicies, new_dn)) - { - Popup::Error (sformat (_("The Policy \'%1\' already exists. -Please select another one."), new_dn)); - continue; - } - break; - } - } - UI::CloseDialog (); - if (ret == `ok && new_dn != "") - { - map new = LdapPopup::PasswordPolicyDialog ($["dn": new_dn ]); - if (new != nil) - { - ppolicies[new_dn] = new; - UI::ChangeWidget (`id (`ppolicy_table), `Items, - maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) - ); - UI::ChangeWidget (`id (`edit), `Enabled, size (ppolicies) > 0); - UI::ChangeWidget (`id (`delete), `Enabled, size (ppolicies) > 0); - } - } - } - if (result == `edit || result == `ppolicy_table) - { - string dn = (string) UI::QueryWidget (`id (`ppolicy_table), `CurrentItem); - map changes = LdapPopup::PasswordPolicyDialog (ppolicies[dn]:$[]); - if (changes != nil) - { - ppolicies[dn] = union (ppolicies[dn]:$[], changes); - } - } - if (result == `delete) - { - string dn = (string) UI::QueryWidget (`id (`ppolicy_table), `CurrentItem); - ppolicies = remove (ppolicies, dn); - ppolicies_deleted = (list<string>) union (ppolicies_deleted, [dn]); - UI::ChangeWidget (`id (`ppolicy_table), `Items, - maplist (string dn, map pp, ppolicies, ``(`item (`id (dn), dn))) - ); - UI::ChangeWidget (`id (`edit), `Enabled, size (ppolicies) > 0); - UI::ChangeWidget (`id (`delete), `Enabled, size (ppolicies) > 0); - } if (result == `next || result == `configure) { @@ -1263,44 +1082,6 @@ UI::SetFocus (`id (`base_config_dn)); continue; } - foreach (string dn, map ppolicy, ppolicies, { - // new ppolicy - if (!haskey (ppolicies_orig, dn)) - { - ppolicy["modified"] = "added"; - ppolicy["pwdAttribute"] = "userPassword"; - ppolicy["objectClass"] = ["pwdPolicy", "namedObject"]; - ppolicy["cn"] = get_cn (dn); - Ldap::ppolicies[dn] = ppolicy; - - } - else - { - map pp = $[]; - foreach (string a, any val, (map<string,any>) ppolicy, { - if (val != ppolicies_orig[dn,a]:nil) - pp[a] = val; - }); - if (pp != $[]) - { - pp["modified"] = "edited"; - Ldap::ppolicies[dn] = pp; - } - } - }); - // deleted ppolicies - foreach (string dn, ppolicies_deleted, { - map pp = Ldap::ppolicies[dn]:$[]; - if (pp["modified"]:"" == "added") - { - Ldap::ppolicies = remove (Ldap::ppolicies, dn); - } - else if (haskey (ppolicies_orig, dn)) - { - pp["modified"] = "deleted"; - Ldap::ppolicies[dn] = pp; - } - }); if (krb5_realm == "" || krb5_kdcip == "" || !Ldap::sssd) sssd_with_krb = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67490 - /trunk/s390/
by aschnell＠svn2.opensuse.org 21 Feb '12

21 Feb '12

Author: aschnell Date: Tue Feb 21 10:50:59 2012 New Revision: 67490 URL: http://svn.opensuse.org/viewcvs/yast?rev=67490&view=rev Log: - updated ignore list Modified: trunk/s390/ (props changed) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67489 - in /trunk/s390/src: clients/dasd.ycp clients/dasd_auto.ycp clients/zfcp.ycp dasd/dialogs.ycp dasd/wizards.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp zfcp/helps.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 20 Feb '12

20 Feb '12

Author: aschnell Date: Mon Feb 20 18:15:21 2012 New Revision: 67489 URL: http://svn.opensuse.org/viewcvs/yast?rev=67489&view=rev Log: - work on getting zfcp modules working with autoyast editor Modified: trunk/s390/src/clients/dasd.ycp trunk/s390/src/clients/dasd_auto.ycp trunk/s390/src/clients/zfcp.ycp trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/wizards.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp trunk/s390/src/zfcp/helps.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/clients/dasd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd.ycp?rev=67… ============================================================================== --- trunk/s390/src/clients/dasd.ycp (original) +++ trunk/s390/src/clients/dasd.ycp Mon Feb 20 18:15:21 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("DASD module started"); @@ -29,7 +22,7 @@ include "s390/dasd/wizards.ycp"; map cmdline_description = $[ - "id" : "controller", + "id" : "DASD", // Command line help text for the Xcontroller module "help" : _("Configuration of DASD"), "guihandler" : DASDSequence, @@ -46,19 +39,11 @@ ] ]; - -/* main ui function */ -any ret = nil; - -ret = CommandLine::Run(cmdline_description); -//ret = DASDSequence (); +any ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); -/* Finish */ y2milestone("DASD module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/dasd_auto.ycp (original) +++ trunk/s390/src/clients/dasd_auto.ycp Mon Feb 20 18:15:21 2012 @@ -121,5 +121,4 @@ y2milestone("----------------------------------------"); return ret; - } Modified: trunk/s390/src/clients/zfcp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp.ycp?rev=67… ============================================================================== --- trunk/s390/src/clients/zfcp.ycp (original) +++ trunk/s390/src/clients/zfcp.ycp Mon Feb 20 18:15:21 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("ZFCP module started"); @@ -31,8 +24,8 @@ map cmdline_description = $[ "id" : "ZFCP", // Command line help text for the Xcontroller module - "help" : _("ZFCP configuration"), - "guihandler" : ZFCPSequence, //ControllerSequence, + "help" : _("Configuration of ZFCP"), + "guihandler" : ZFCPSequence, "initialize" : ZFCPController::Read, "finish" : ZFCPController::Write, "actions" : $[ @@ -46,20 +39,11 @@ ] ]; - -/* main ui function */ -any ret = nil; - -//ret = CommandLine::Run(cmdline_description); -//ret = ZFCPSequence (); -ret = CommandLine::Run(cmdline_description); +any ret = CommandLine::Run(cmdline_description); y2debug("ret=%1", ret); -/* Finish */ y2milestone("ZFCP module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Mon Feb 20 18:15:21 2012 @@ -38,9 +38,9 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -symbol ReadDialog() { +symbol ReadDialog() +{ Wizard::RestoreHelp(DASD_HELPS["read"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = DASDController::Read(); return ret ? `next : `abort; } @@ -49,9 +49,9 @@ * Write settings dialog * @return `abort if aborted and `next otherwise */ -symbol WriteDialog() { +symbol WriteDialog() +{ Wizard::RestoreHelp(DASD_HELPS["write"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = DASDController::Write(); return ret ? `next : `abort; } @@ -273,7 +273,7 @@ } foreach (integer id, selected, { - string channel = DASDController::devices[id,"channel"]:""; + string channel = DASDController::devices[id, "channel"]:""; boolean diag = DASDController::diag[channel]:false; DASDController::ActivateDisk(channel, diag); }); @@ -295,7 +295,7 @@ } foreach (integer id, selected, { - string channel = DASDController::devices[id,"channel"]:""; + string channel = DASDController::devices[id, "channel"]:""; boolean diag = DASDController::diag[channel]:false; DASDController::DeactivateDisk(channel, diag); }); @@ -461,12 +461,6 @@ */ symbol AddDASDDiskDialog() { - if (!Mode::config()) - { - y2error("DASD Add Disk dialog shouldn't be run in Mode::config()"); - return `back; - } - /* Minimal text for the help */ string help = DASD_HELPS["disk_add_config"]:""; @@ -559,12 +553,6 @@ */ symbol DeleteDASDDiskDialog() { - if (!Mode::config()) - { - y2error("DASD Delete Disk dialog shouldn't be run in Mode::config()"); - return `back; - } - list<integer> selected = ListSelectedDASD(); if (isempty(selected)) { Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Mon Feb 20 18:15:21 2012 @@ -42,7 +42,7 @@ "delete" : $[ `abort : `abort, `next : "main" - ], + ] ]; return Sequencer::Run(aliases, sequence); Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Mon Feb 20 18:15:21 2012 @@ -14,12 +14,10 @@ textdomain "s390"; import "Mode"; -import "Progress"; import "Report"; -import "Stage"; -import "Summary"; import "Popup"; + global map<integer,map<string,any> > devices = $[]; global string filter_min = "0.0.0000"; @@ -36,6 +34,7 @@ global void ProbeDisks(); global boolean GetModified(); + boolean disk_configured = false; /** @@ -136,39 +135,77 @@ } + global string GetNextLUN(string fcp_lun) + { + if (fcp_lun == nil || fcp_lun == "") + fcp_lun = "0"; + + integer old_lun = tointeger(fcp_lun); + integer new_lun = old_lun; + + foreach (integer k, map<string, any> v, devices, { + if (old_lun == tointeger(v["detail", "fcp_lun"]:"")) + { + if (v["vendor"]:"" == "IBM" && v["device"]:"" == "25f03") + new_lun = old_lun + 0x100000000; + else + new_lun = old_lun + 1; + } + }); + + return tohexstring(new_lun, 16); + } + + /** * Read all controller settings * @return true on success */ global boolean Read() { + ProbeDisks(); + disk_configured = false; return true; } + /** * Write all controller settings * @return true on success */ global boolean Write() { - if (disk_configured && Mode::normal ()) + if (!Mode::normal()) + { + foreach (integer index, map<string, any> device, devices, { + string channel = device["controller_id"]:""; + string wwpn = device["wwpn"]:""; + string lun = device["fcp_lun"]:""; + ActivateDisk(channel, wwpn, lun); + }); + } + + if (!Mode::installation()) { - // popup label - UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + if (disk_configured) + { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); - string command = "/sbin/mkinitrd && /sbin/zipl"; - y2milestone ("Running command %1", command); - any ret = SCR::Execute(.target.bash, command); - y2milestone("Exit code: %1", ret); + string command = "/sbin/mkinitrd && /sbin/zipl"; + y2milestone ("Running command %1", command); + any ret = SCR::Execute(.target.bash, command); + y2milestone("Exit code: %1", ret); - UI::CloseDialog(); + UI::CloseDialog(); + } } return true; - } + /** * Get all controller settings from the first parameter * (For use by autoinstallation.) @@ -177,12 +214,10 @@ */ global boolean Import(map settings) { - if (Mode::config ()) - { integer index = -1; devices = listmap (map d, settings["devices"]:[], { index = index + 1; - map<string,any> m = $[ + map<string, any> m = $[ "detail" : $[ "controller_id" : d["controller_id"]:"", "wwpn" : d["wwpn"]:"", @@ -191,16 +226,11 @@ ]; return $[ index : m ]; }); - } - else if (Stage::initial ()) - { - foreach (map d, settings["devices"]:[], { - ActivateDisk (d["controller_id"]:"", d["wwpn"]:"", d["fcp_lun"]:""); - }); - } + return true; } + /** * Dump the controller settings to a single map * (For use by autoinstallation.) @@ -208,19 +238,14 @@ */ global map Export() { -ProbeDisks(); - list<map<string,any> > l = maplist (integer k, map<string,any> v, - devices, - { + list<map<string, any> > l = maplist (integer k, map<string, any> v, devices, { return $[ - "controller_id" : v["detail","controller_id"]:"", - "wwpn" : v["detail","wwpn"]:"", - "fcp_lun" : v["detail","fcp_lun"]:"", - ]; - }); - return $[ - "devices" : l, - ]; + "controller_id" : v["detail", "controller_id"]:"", + "wwpn" : v["detail", "wwpn"]:"", + "fcp_lun" : v["detail", "fcp_lun"]:"", + ]; }); + + return $[ "devices" : l, ]; } @@ -359,9 +384,6 @@ */ global void ProbeDisks() { -/* if (Mode::config ()) - return;*/ - // popup label UI::OpenDialog(`Label(_("Reading Configured ZFCP Devices"))); @@ -379,6 +401,8 @@ return $[ index : d ]; }); + y2milestone("probed zfcps %1", devices); + UI::CloseDialog(); } Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Mon Feb 20 18:15:21 2012 @@ -20,13 +20,26 @@ include "s390/zfcp/helps.ycp"; + + /** + * List ZFCP devices that are currently being selected + * @return list<integer> list of IDs of selected ZFCP devices + */ + list<integer> ListSelectedZFCP() + { + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); + y2milestone("selected %1", selected); + return selected; + } + + /** * Read settings dialog * @return `abort if aborted and `next otherwise */ -symbol ReadDialog() { +symbol ReadDialog() +{ Wizard::RestoreHelp(ZFCP_HELPS["read"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = ZFCPController::Read(); return ret ? `next : `abort; } @@ -35,9 +48,9 @@ * Write settings dialog * @return `abort if aborted and `next otherwise */ -symbol WriteDialog() { +symbol WriteDialog() +{ Wizard::RestoreHelp(ZFCP_HELPS["write"]:""); - // Controller::AbortFunction = PollAbort; boolean ret = ZFCPController::Write(); return ret ? `next : `abort; } @@ -71,20 +84,6 @@ /** - * Restart the ZFCP-Dialog - */ -void ReloadZFCPDialog() -{ - ZFCPController::ProbeDisks(); - - list<term> items = GetZFCPDiskItems(); - - UI::ChangeWidget(`id(`table), `Items, items); - UI::ChangeWidget(`id(`delete), `Enabled, !isempty(items)); - UI::SetFocus(`table); -} - -/** * Show the ZFCP-Dialog */ void DisplayZFCPDialog() @@ -118,7 +117,7 @@ ) ), `HBox( - `Table(`id(`table), `opt(`notify), header, []) + `Table(`id(`table), `opt(`multiSelection), header, []) ), `HBox( `PushButton(`id(`add), Label::AddButton ()), @@ -127,8 +126,6 @@ ) ); - y2debug("Content: %1\n", content); - /* Apply the settings */ Wizard::SetContentsButtons(caption, content, help, Label::BackButton(), Label::NextButton()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); @@ -139,6 +136,20 @@ /** + * Restart the ZFCP-Dialog + */ +void ReloadZFCPDialog() +{ + list<term> items = GetZFCPDiskItems(); + + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); + UI::ChangeWidget(`id(`table), `Items, items); + UI::ChangeWidget(`id(`table), `SelectedItems, selected); + UI::SetFocus(`table); +} + + +/** * Show the ZFCP-Dialog * @return symbol From the dialog */ @@ -147,15 +158,10 @@ DisplayZFCPDialog (); ReloadZFCPDialog (); - any ret = nil; - - integer selected = 0; - + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); - - selected = (integer) UI::QueryWidget (`id (`table), `CurrentItem); + ret = (symbol) UI::UserInput(); if (ret == `filter) { @@ -177,6 +183,11 @@ ret = nil; continue; } + else if (ret == `table) + { + ret = nil; + continue; + } else if (ret == `abort || ret == `cancel) { // yes-no popup @@ -185,46 +196,14 @@ { ret = nil; } + continue; } - else if (ret == `delete) - { - map<string,any> descr = ZFCPController::devices[selected]:$[]; - string dev_name = (string)(descr["dev_name"]:""); - string channel = descr["detail", "controller_id"]:"unknown"; - string wwpn = descr["detail", "wwpn"]:"unknown"; - string fcp_lun = descr["detail", "fcp_lun"]:"unknown"; - - // popup qestion, %1 is device name (eg. /dev/sda) - if (! Popup::YesNo (sformat (_("Remove device %1?"), dev_name))) - { - ret = nil; - continue; - } - if (Mode::config ()) - { - ZFCPController::devices - = remove (ZFCPController::devices, selected); - } - else - { - ZFCPController::DeactivateDisk (channel, wwpn, fcp_lun); - } - ReloadZFCPDialog (); - ret = nil; - } - } - if (ret == `add) - { - map<string,any> descr = ZFCPController::devices[selected]:$[]; - string dev_name = (string)(descr["dev_name"]:""); - string channel = descr["controller_id"]:"unknown"; - string wwpn = descr["detail", "wwpn"]:"unknown"; - if (wwpn != "unknown") - ZFCPController::previous_settings["wwpn"] = wwpn; } - return (symbol) ret; + + return ret; } + /** * Add ZFCP-Dialog * @return symbol the dialog @@ -238,25 +217,9 @@ string caption = _("Add New ZFCP Device"); string fcp_lun = ZFCPController::previous_settings["fcp_lun"]:""; - if (fcp_lun == nil || fcp_lun == "") - fcp_lun = "0"; - integer i_lun = tointeger (fcp_lun); - integer new_lun = i_lun; - - foreach (integer k, map<string,any> v, ZFCPController::devices, { - if (i_lun == tointeger (v["detail", "fcp_lun"]:"")) - { - if (v["vendor"]:"" == "IBM" && v["device"]:"" == "25f03") - new_lun = i_lun + tointeger ("0x100000000"); - else - new_lun = i_lun + 1; - } - }); - fcp_lun = tohexstring (new_lun); - if (fcp_lun != "") - fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); + fcp_lun = ZFCPController::GetNextLUN(fcp_lun); - list<string>items = []; + list<string> items = []; if (Mode::config ()) { items = maplist (integer index, map<string, any> d, ZFCPController::devices, { @@ -368,9 +331,10 @@ string channel = (string) UI::QueryWidget(`id(`channel), `Value); string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); - ZFCPController::previous_settings["wwpm"] = wwpn; - ZFCPController::previous_settings["fcp_lun"] = lun; + ZFCPController::previous_settings["channel"] = channel; + ZFCPController::previous_settings["wwpn"] = wwpn; + ZFCPController::previous_settings["fcp_lun"] = lun; if (Mode::config()) { @@ -393,4 +357,40 @@ return ret; } + +/** + * Run the dialog for deleting ZFCPs + * @return symbol from DeleteZFCPDiskDialog + */ +symbol DeleteZFCPDiskDialog() +{ + list<integer> selected = ListSelectedZFCP(); + if (isempty(selected)) + { + // error popup message + Popup::Message (_("No disk selected.")); + } + else + { + if (Mode::config()) + { + foreach(integer index, selected, { ZFCPController::RemoveDevice(index); }); + } + else + { + foreach(integer index, selected, { + map d = ZFCPController::devices[index]:$[]; + string channel = d["detail", "controller_id"]:"unknown"; + string wwpn = d["detail", "wwpn"]:"unknown"; + string fcp_lun = d["detail", "fcp_lun"]:"unknown"; + ZFCPController::DeactivateDisk(channel, wwpn, fcp_lun); + }); + + ZFCPController::ProbeDisks(); + } + } + + return `next; +} + } Modified: trunk/s390/src/zfcp/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/helps.ycp?rev=6748… ============================================================================== --- trunk/s390/src/zfcp/helps.ycp (original) +++ trunk/s390/src/zfcp/helps.ycp Mon Feb 20 18:15:21 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; /** @@ -74,5 +72,4 @@ ]; -/* EOF */ } Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Mon Feb 20 18:15:21 2012 @@ -23,7 +23,8 @@ { map aliases = $[ "main" : ``(ZFCPDialog()), - "add" : ``(AddZFCPDiskDialog()) + "add" : ``(AddZFCPDiskDialog()), + "delete" : ``(DeleteZFCPDiskDialog()) ]; map sequence = $[ @@ -31,12 +32,17 @@ "main" : $[ `abort : `abort, `next : `next, - `add : "add", + `add : "add", + `delete : "delete" ], "add" : $[ `abort : `abort, - `next : "main", + `next : "main" ], + "delete" : $[ + `abort : `abort, + `next : "main" + ] ]; return Sequencer::Run(aliases, sequence); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67488 - in /trunk/ncurses-pkg/src: NCPkgPackageDetails.cc NCPkgPackageDetails.h
by gs＠svn2.opensuse.org 20 Feb '12

20 Feb '12

Author: gs Date: Mon Feb 20 13:15:01 2012 New Revision: 67488 URL: http://svn.opensuse.org/viewcvs/yast?rev=67488&view=rev Log: improve displaying of patch description (add paragraphs) Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgPackageDetails.h Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Mon Feb 20 13:15:01 2012 @@ -264,6 +264,34 @@ } +string NCPkgPackageDetails::createHtmlParagraphs( string value ) +{ + NCstring input( value ); + NCtext descr( input ); + NCtext html_descr( NCstring( "" ) ); + string description = ""; + + list<NCstring>::const_iterator line; + + for ( line = descr.Text().begin(); line != descr.Text().end(); ++line ) + { + NCstring curr_line( *line ); + if ( curr_line.Str().empty() ) + html_descr.append( NCstring("") ); + else + html_descr.append( NCstring(" " + curr_line.Str()) ); + } + html_descr.append( NCstring("") ); + + for ( line = html_descr.Text().begin(); line != html_descr.Text().end(); ++line ) + { + NCstring curr_line( *line ); + description += curr_line.Str(); + } + + return description; +} + bool NCPkgPackageDetails::patchDescription( ZyppObj objPtr, ZyppSel selectable ) { ZyppPatch patchPtr = tryCastToZyppPatch( objPtr ); @@ -301,9 +329,9 @@ // get and format the patch description string value = patchPtr->description(); - descr += ""; - descr += value; - descr += ""; + yuiDebug() << "Patch description: " << value << endl; + + descr += createHtmlParagraphs( value ); descr += _("References: "); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.h (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.h Mon Feb 20 13:15:01 2012 @@ -61,6 +61,8 @@ string createText( list <string> info, bool oneline ); + string createHtmlParagraphs( string description ); + string createRelLine( const zypp::Capabilities & info ); string commonHeader( ZyppObj pkgPtr ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67480 - /trunk/s390/src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 18:01:25 2012 New Revision: 67480 URL: http://svn.opensuse.org/viewcvs/yast?rev=67480&view=rev Log: - improved input validation Modified: trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 17 18:01:25 2012 @@ -518,14 +518,18 @@ { // error popup Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); ret = nil; + continue; } if (DASDController::GetDeviceIndex(channel) != nil) { // error popup Popup::Error(_("Channel already exists.")); + UI::SetFocus(`channel); ret = nil; + continue; } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67479 - /trunk/s390/src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 18:00:58 2012 New Revision: 67479 URL: http://svn.opensuse.org/viewcvs/yast?rev=67479&view=rev Log: - improved input validation Modified: trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 17 18:00:58 2012 @@ -75,9 +75,6 @@ */ void ReloadZFCPDialog() { - ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); - ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - ZFCPController::ProbeDisks(); list<term> items = GetZFCPDiskItems(); @@ -106,7 +103,7 @@ // table header `Right(_("ZFCP-LUN")) ); - + /* Dialog content */ term content = `VBox( `HBox( @@ -160,8 +157,23 @@ selected = (integer) UI::QueryWidget (`id (`table), `CurrentItem); - if (ret == `filter) { - ReloadZFCPDialog (); + if (ret == `filter) + { + string filter_min = (string) UI::QueryWidget(`min_chan, `Value); + string filter_max = (string) UI::QueryWidget(`max_chan, `Value); + + if (!ZFCPController::ValidChannel(filter_min) || !ZFCPController::ValidChannel(filter_max)) + { + // error popup + Popup::Error(_("Invalid filter channels.")); + ret = nil; + continue; + } + + ZFCPController::filter_min = filter_min; + ZFCPController::filter_max = filter_max; + + ReloadZFCPDialog(); ret = nil; continue; } @@ -289,11 +301,13 @@ Wizard::RestoreBackButton (); Wizard::RestoreAbortButton (); - any ret = nil; + UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); + UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); + ret = (symbol) UI::UserInput(); if (ret == `get_wwpn){ list<string> items = ZFCPController::GetWWPNs((string)UI::QueryWidget(`channel, `Value)); @@ -316,45 +330,59 @@ } else if (ret == `next) { - string wwpn = (string)UI::QueryWidget (`id (`wwpn), `Value); - boolean ok = true; - if (substring (wwpn, 0, 2) != "0x") - ok = false; - wwpn = substring (wwpn, 2); - if (size (wwpn) != 16) - ok = false; - if (size (filterchars (wwpn, "1234567890abcdef")) != 16) - ok = false; - if (! ok) + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); + string fcp_lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + + if (!ZFCPController::ValidChannel(channel)) { - // error report - Report::Error (_("The entered WWPN is invalid.")); - UI::SetFocus (`wwpn); + // error popup + Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); ret = nil; + continue; + } + + if (!ZFCPController::ValidWWPN(wwpn)) + { + // error popup + Report::Error(_("The entered WWPN is invalid.")); + UI::SetFocus(`wwpn); + ret = nil; + continue; + } + + if (!ZFCPController::ValidFCPLUN(fcp_lun)) + { + // error popup + Report::Error(_("The entered FCP-LUN is invalid.")); + UI::SetFocus(`fcp_lun); + ret = nil; + continue; } } } if (ret == `next) { - string channel = (string)UI::QueryWidget (`id (`channel), `Value); - string wwpn = (string)UI::QueryWidget (`id (`wwpn), `Value); - string lun = (string)UI::QueryWidget (`id (`fcp_lun), `Value); + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); + string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); ZFCPController::previous_settings["wwpm"] = wwpn; ZFCPController::previous_settings["fcp_lun"] = lun; ZFCPController::previous_settings["channel"] = channel; - if (Mode::config ()) + + if (Mode::config()) { map<string,any> m = $[ "controller_id" : channel, "wwpn" : wwpn, "fcp_lun" : lun, ]; + m = $["detail" : m ]; - integer index = -1; - while (haskey (ZFCPController::devices, index)) - index = index + 1; - ZFCPController::devices[index] = m; + + ZFCPController::AddDevice(m); } else { @@ -362,7 +390,7 @@ } } - return (symbol) ret; + return ret; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67478 - /trunk/s390/src/modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 17:59:43 2012 New Revision: 67478 URL: http://svn.opensuse.org/viewcvs/yast?rev=67478&view=rev Log: - moved some functionality to module Modified: trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 17 17:59:43 2012 @@ -34,6 +34,7 @@ global void ActivateDisk(string channel, string wwpn, string lun); global void ProbeDisks(); +global boolean GetModified(); boolean disk_configured = false; @@ -61,10 +62,6 @@ return hex; } -/** - * Prototypes - */ -global boolean Modified(); /** * Data was modified? @@ -75,17 +72,12 @@ */ global boolean proposal_valid = false; -/** - * Write only, used during autoinstallation. - * Don't run services and SuSEconfig, it's all done at one place. - */ -global boolean write_only = false; /** * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +global boolean() AbortFunction = GetModified; /** @@ -103,24 +95,53 @@ * Data was modified? * @return true if modified */ -global boolean Modified() { - y2debug("modified=%1",modified); +global boolean GetModified() +{ return modified; } + +global void SetModified(boolean value) +{ + modified = value; +} + + /** * Is this kind of disk controller available? * @return boolean true if it is */ -global boolean Available () { +global boolean Available() +{ return true; } + + global boolean ValidChannel(string channel) + { + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + return regexpmatch(channel, regexp); + } + + global boolean ValidWWPN(string wwpn) + { + string regexp = "^0x([0-9a-fA-F]{16})$"; + return regexpmatch(wwpn, regexp); + } + + global boolean ValidFCPLUN(string fcp_lun) + { + string regexp = "^0x([0-9a-fA-F]{16})$"; + return regexpmatch(fcp_lun, regexp); + } + + /** * Read all controller settings * @return true on success */ -global boolean Read() { +global boolean Read() +{ disk_configured = false; return true; } @@ -129,7 +150,8 @@ * Write all controller settings * @return true on success */ -global boolean Write() { +global boolean Write() +{ if (disk_configured && Mode::normal ()) { // popup label @@ -153,7 +175,8 @@ * @param settings The YCP structure to be imported. * @return boolean True on success */ -global boolean Import (map settings) { +global boolean Import(map settings) +{ if (Mode::config ()) { integer index = -1; @@ -183,7 +206,8 @@ * (For use by autoinstallation.) * @return map Dumped settings (later acceptable by Import ()) */ -global map Export () { +global map Export() +{ ProbeDisks(); list<map<string,any> > l = maplist (integer k, map<string,any> v, devices, @@ -243,6 +267,35 @@ } + global void + AddDevice(map<string, any> d) + { + integer index = 0; + while (haskey(devices, index)) + index = index + 1; + devices[index] = d; + } + + + global void + RemoveDevice(integer index) + { + devices = remove(devices, index); + } + + + global integer + GetDeviceIndex(string channel) + { + integer ret = nil; + foreach(integer index , map<string, any> d, devices, { + if (d["channel"]:"0.0.0000" == channel) + ret = index; + }); + return ret; + } + + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration @@ -297,7 +350,7 @@ */ global boolean IsAvailable() { - return size(GetControllers()) > 0; + return !isempty(GetControllers()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67477 - /trunk/s390/src/clients/zfcp_auto.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 17:59:01 2012 New Revision: 67477 URL: http://svn.opensuse.org/viewcvs/yast?rev=67477&view=rev Log: - use switch statement Modified: trunk/s390/src/clients/zfcp_auto.ycp Modified: trunk/s390/src/clients/zfcp_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/zfcp_auto.ycp (original) +++ trunk/s390/src/clients/zfcp_auto.ycp Fri Feb 17 17:59:01 2012 @@ -10,17 +10,7 @@ * goes through the configuration and return the setting. * Does not do any changes to the configuration. */ - -/** - * @param function to execute - * @param map/list of controller settings - * @return map edited settings, Summary or boolean on success depending on called function - * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("controller_auto", [ "Summary", mm ]); - */ - { - textdomain "s390"; y2milestone("----------------------------------------"); @@ -43,66 +33,92 @@ y2debug("func=%1", func); y2debug("param=%1", param); -/* Create a summary*/ -if(func == "Summary") { - ret = HTML::List(ZFCPController::Summary()); -} -/* Reset configuration */ -else if (func == "Reset") { - ZFCPController::Import($[]); - ret = $[]; -} -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = ZFCPAutoSequence(); -} -/* Import configuration */ -else if (func == "Import") { - ret = ZFCPController::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = ZFCPController::Export(); -} -/* did configuration change */ -else if (func == "GetModified") { - ret = ZFCPController::modified; -} -/* set configuration as changed */ -else if (func == "SetModified") { - ZFCPController::modified = true; - ret = true; -} -/* Return needed packages */ -else if (func == "Packages") { - ret = ZFCPController::AutoPackages(); -} -/* Read current state */ -else if (func == "Read") { - import "Progress"; - Progress::off(); - ret = ZFCPController::Read(); - Progress::on(); -} -/* Write given settings */ -else if (func == "Write") { - import "Progress"; - Progress::off(); - ZFCPController::write_only = true; - ret = ZFCPController::Write(); - Progress::on(); -} -/* Unknown function */ -else { - y2error("Unknown function: %1", func); - ret = false; -} + switch (func) + { + case "Summary": // Create a summary + { + ret = HTML::List(ZFCPController::Summary()); + break; + } + + case "Reset": // Reset configuration + { + ZFCPController::Import($[]); + ZFCPController::SetModified(true); + ret = $[]; + break; + } + + case "Change": // Change configuration + { + ret = ZFCPAutoSequence(); + ZFCPController::SetModified(true); + break; + } + + case "Import": // Import configuration + { + ret = ZFCPController::Import(param); + ZFCPController::SetModified(true); + break; + } + + case "Export": // Return actual state + { + ret = ZFCPController::Export(); + ZFCPController::SetModified(false); + break; + } + + case "GetModified": // Did configuration change + { + ret = ZFCPController::GetModified(); + break; + } + + case "SetModified": // Set configuration as changed + { + ZFCPController::SetModified(true); + ret = true; + break; + } + + case "Packages": // Return needed packages + { + ret = ZFCPController::AutoPackages(); + break; + } + + case "Read": // Read current state + { + import "Progress"; + Progress::off(); + ret = ZFCPController::Read(); + Progress::on(); + ZFCPController::SetModified(true); + break; + } + + case "Write": // Write given settings + { + import "Progress"; + Progress::off(); + ret = ZFCPController::Write(); + Progress::on(); + break; + } + + default: // Unknown function + { + y2error("Unknown function: %1", func); + ret = false; + break; + } + } y2debug("ret=%1", ret); y2milestone("ZFCP auto finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67476 - in /branches/SuSE-Code-11-SP2-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: tgoettlicher Date: Fri Feb 17 16:27:50 2012 New Revision: 67476 URL: http://svn.opensuse.org/viewcvs/yast?rev=67476&view=rev Log: Fixed selection and sorting in Table widget (bnc#746156) -This line, and those below, will be ignored-- M qt/VERSION.cmake M qt/src/YQTable.cc M qt/package/yast2-qt.changes Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/VE… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake Fri Feb 17 16:27:50 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") Modified: branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes Fri Feb 17 16:27:50 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 17 16:27:15 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection and sorting in Table widget (bnc#746156) +- V 2.21.6 + +------------------------------------------------------------------- Thu Dec 1 17:52:42 CET 2011 - tgoettlicher(a)suse.de - Follow links to anchors in YQTextBrowser (bnc #727330) Modified: branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Fri Feb 17 16:27:50 2012 @@ -71,6 +71,8 @@ layout->addWidget( _qt_listView ); _qt_listView->setAllColumnsShowFocus( true ); _qt_listView->header()->setStretchLastSection( false ); + _qt_listView->sortItems( 0, Qt::AscendingOrder); + setKeepSorting( keepSorting() ); @@ -214,8 +216,6 @@ if ( sel ) YQTable::selectItem( sel, true ); - _qt_listView->sortItems( 0, Qt::AscendingOrder); - for ( int i=0; i < columns(); i++ ) _qt_listView->resizeColumnToContents( i ); } @@ -295,7 +295,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem ) + if ( listViewItem && listViewItem->isSelected() ) selectOrigItem( listViewItem ); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67475 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: tgoettlicher Date: Fri Feb 17 16:17:55 2012 New Revision: 67475 URL: http://svn.opensuse.org/viewcvs/yast?rev=67475&view=rev Log: Fixed selection and sorting in Table widget (bnc#746156) (2.22.3) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTable.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67475&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Fri Feb 17 16:17:55 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Feb 17 16:17:55 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 17 16:17:32 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection and sorting in Table widget (bnc#746156) +- Version: 2.22.3 + +------------------------------------------------------------------- Wed Feb 8 14:54:15 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc#731540: fixed auto-scroll in LogView Modified: trunk/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=67475&r1=6… ============================================================================== --- trunk/qt/src/YQTable.cc (original) +++ trunk/qt/src/YQTable.cc Fri Feb 17 16:17:55 2012 @@ -95,6 +95,7 @@ _qt_listView->setHeaderLabels( headers ); _qt_listView->header()->setResizeMode( QHeaderView::Interactive ); + _qt_listView->sortItems( 0, Qt::AscendingOrder); // @@ -216,8 +217,6 @@ if ( sel ) YQTable::selectItem( sel, true ); - _qt_listView->sortItems( 0, Qt::AscendingOrder); - for ( int i=0; i < columns(); i++ ) _qt_listView->resizeColumnToContents( i ); } @@ -297,7 +296,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem ) + if ( listViewItem && listViewItem->isSelected() ) selectOrigItem( listViewItem ); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67474 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 16:13:42 2012 New Revision: 67474 URL: http://svn.opensuse.org/viewcvs/yast?rev=67474&view=rev Log: - addad progress popup - cleanup Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 17 16:13:42 2012 @@ -180,7 +180,7 @@ string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone("Running command %1", command); any ret = SCR::Execute(.target.bash, command); - y2milestone ("Exit code: %1", ret); + y2milestone("Exit code: %1", ret); UI::CloseDialog(); } @@ -309,12 +309,11 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map<string,any> d, devices, { - // summary text, %1 is channel ID (number), - // %2 and %3 are Yes or No + // summary text, %1 is channel (number), // %2 and %3 are Yes or No return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); - y2milestone ("Summary: %1", ret); + y2milestone("Summary: %1", ret); return ret; } @@ -407,10 +406,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportActivationError(any id, integer ret) +void ReportActivationError(string channel, integer ret) { switch (ret) { @@ -420,59 +419,59 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>."), id)); + _("%1: No device found for <ccwid>."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not change state of the device."), id)); + _("%1: Could not change state of the device."), channel)); break; case 5: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Device is not a DASD."), id)); + _("%1: Device is not a DASD."), channel)); break; case 6: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not load module."), id)); + _("%1: Could not load module."), channel)); break; case 7: // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification - _("%1: Failed to activate DASD."), id)); + _("%1: Failed to activate DASD."), channel)); break; case 8: // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification - _("%1: DASD is not formatted."), id)); + _("%1: DASD is not formatted."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 17 16:13:42 2012 @@ -132,15 +132,17 @@ global boolean Write() { if (disk_configured && Mode::normal ()) { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone ("Running command %1", command); - any ret = SCR::Execute (.target.bash, command); - y2milestone ("Exit code: %1", ret); - } - else - { - y2milestone ("No new disk configured"); + any ret = SCR::Execute(.target.bash, command); + y2milestone("Exit code: %1", ret); + + UI::CloseDialog(); } + return true; } @@ -248,26 +250,25 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map<string,any> d, devices, { - // summary text, %1 is channel ID, %1 is WWPN, %3 is LUN + // summary text, %1 is channel, %1 is WWPN, %3 is LUN // (all of them are numbers) - string s = sformat (_("Channel ID: %1, WWPN: %2, ZFCP LUN: %3"), - d["detail","controller_id"]:"", - d["detail","wwpn"]:"", - d["detail","fcp_lun"]:"" - ); - return s; + return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"), + d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", + d["detail", "fcp_lun"]:""); }); - y2milestone ("Summary: %1", ret); + y2milestone("Summary: %1", ret); return ret; } + /** * Return packages needed to be installed and removed during * Autoinstallation to insure module has all needed software * installed. * @return map with 2 lists. */ -global map AutoPackages() { +global map AutoPackages() +{ return $[ "install":[], "remove":[] ]; } @@ -331,10 +332,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportActivationError(any id, integer ret) +void ReportActivationError(string channel, integer ret) { switch (ret) { @@ -344,61 +345,61 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>."), id)); + _("%1: No device found for <ccwid>."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: WWPN invalid."), id)); + _("%1: WWPN invalid."), channel)); break; case 5: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate WWPN for adapter %1."), id)); + _("%1: Could not activate WWPN for adapter %1."), channel)); break; case 6: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate ZFCP device."), id)); + _("%1: Could not activate ZFCP device."), channel)); break; case 7: Report::Error (sformat ( // error report, %1 is device identification - _("%1: SCSI disk could not be deactivated."), id)); + _("%1: SCSI disk could not be deactivated."), channel)); break; case 8: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP LUN could not be unregistered."), id)); + _("%1: ZFCP LUN could not be unregistered."), channel)); break; case 9: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP WWPN could not be unregistered."), id)); + _("%1: ZFCP WWPN could not be unregistered."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } @@ -406,10 +407,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportControllerActivationError(any id, integer ret) +void ReportControllerActivationError(string channel, integer ret) { switch (ret) { @@ -419,43 +420,43 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Device <ccwid> does not exist."), id)); + _("%1: Device <ccwid> does not exist."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Module zfcp could not be loaded."), id)); + _("%1: Module zfcp could not be loaded."), channel)); break; case 5: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Adapter status could not be changed."), id)); + _("%1: Adapter status could not be changed."), channel)); break; case 6: Report::Error (sformat ( // error report, %1 is device identification - _("%1: WWPN ports still active."), id)); + _("%1: WWPN ports still active."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } @@ -463,7 +464,7 @@ /** * Activate a disk - * @param channel string channel id + * @param channel string channel * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ @@ -499,8 +500,8 @@ /** - * Activate a disk - * @param channel string channel id + * Deactivate a disk + * @param channel string channel * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67473 - in /trunk/s390/src: clients/Makefile.am dasd/Makefile.am modules/Makefile.am zfcp/Makefile.am
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 14:43:48 2012 New Revision: 67473 URL: http://svn.opensuse.org/viewcvs/yast?rev=67473&view=rev Log: - cleanup Modified: trunk/s390/src/clients/Makefile.am trunk/s390/src/dasd/Makefile.am trunk/s390/src/modules/Makefile.am trunk/s390/src/zfcp/Makefile.am Modified: trunk/s390/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/Makefile.am?rev… ============================================================================== --- trunk/s390/src/clients/Makefile.am (original) +++ trunk/s390/src/clients/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,6 +1,6 @@ -# Makefile.am for zfcp/src - -yncludedir = @yncludedir@/s390/zfcp +# +# Makefile.am for s390/src/clients +# client_DATA = \ zfcp.ycp \ @@ -27,7 +27,6 @@ iucvterminal.desktop \ iucvterminal-server.desktop - EXTRA_DIST = $(client_DATA) $(desktop_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/s390/src/dasd/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/Makefile.am?rev=67… ============================================================================== --- trunk/s390/src/dasd/Makefile.am (original) +++ trunk/s390/src/dasd/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,4 +1,6 @@ -# Makefile.am for dasd/src +# +# Makefile.am for s390/src/dasd +# yncludedir = @yncludedir@/s390/dasd Modified: trunk/s390/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Makefile.am?rev… ============================================================================== --- trunk/s390/src/modules/Makefile.am (original) +++ trunk/s390/src/modules/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,4 +1,6 @@ -# Makefile.am for dasd/src +# +# Makefile.am for s390/src/modules +# module_DATA = \ DASDController.ycp \ Modified: trunk/s390/src/zfcp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/Makefile.am?rev=67… ============================================================================== --- trunk/s390/src/zfcp/Makefile.am (original) +++ trunk/s390/src/zfcp/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,4 +1,6 @@ -# Makefile.am for zfcp/src +# +# Makefile.am for s390/src/zfcp +# yncludedir = @yncludedir@/s390/zfcp @@ -7,7 +9,6 @@ wizards.ycp \ dialogs.ycp - EXTRA_DIST = $(ynclude_DATA) include $(top_srcdir)/Makefile.am.common -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67472 - /trunk/s390/package/yast2-s390.changes
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 14:43:15 2012 New Revision: 67472 URL: http://svn.opensuse.org/viewcvs/yast?rev=67472&view=rev Log: - fixed typos Modified: trunk/s390/package/yast2-s390.changes Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri Feb 17 14:43:15 2012 @@ -1,12 +1,12 @@ ------------------------------------------------------------------- Wed Feb 15 11:25:49 CET 2012 - aschnell(a)suse.de -- make DASD module work for autoyast editor +- make DASD module work with AutoYaST editor ------------------------------------------------------------------- Fri Feb 10 14:59:45 CET 2012 - aschnell(a)suse.de -- used multiselection table in main DASD dialog +- use multiselection table in main DASD dialog ------------------------------------------------------------------- Wed Dec 7 10:04:50 UTC 2011 - coolo(a)suse.com @@ -506,7 +506,7 @@ Wed Mar 10 11:11:20 CET 2004 - jsrain(a)suse.de - added checking of DASD-only/zFCP-only/mixed system -- removed filter support fro zFCP disks +- removed filter support for zFCP disks - fixed .spec file (use ExclusiveArch) - fixed parameters of dasd_configure script - better defaults for new ZFCP disk, combo box for channels -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67471 - in /trunk/s390/src/config: dasd.rnc zfcp.rnc
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 14:42:48 2012 New Revision: 67471 URL: http://svn.opensuse.org/viewcvs/yast?rev=67471&view=rev Log: - updated schemas Modified: trunk/s390/src/config/dasd.rnc trunk/s390/src/config/zfcp.rnc Modified: trunk/s390/src/config/dasd.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/config/dasd.rnc?rev=674… ============================================================================== --- trunk/s390/src/config/dasd.rnc (original) +++ trunk/s390/src/config/dasd.rnc Fri Feb 17 14:42:48 2012 @@ -2,88 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" - dasd = element dasd { element devices { LIST, element listentry { - element bus { text }? & - element bus_hwcfg { text }? & - element channel { text }? & - element class_id { INTEGER }? & - element detail { - element cu_model { INTEGER }? & - element dev_model { INTEGER }? & - element lcss { INTEGER }? - }? & - element dev_name { text }? & - element dev_names { - LIST, - element listentry { text }* - }? & - element dev_num { - element major { INTEGER }? & - element minor { INTEGER }? & - element range { INTEGER }? & - element type { text }? - }? & - element device { text }? & - element device_id { INTEGER }? & - element driver { text }? & - element drivers { - LIST, - element listentry { - element active { BOOLEAN }? & - element modprobe { BOOLEAN }? & - element modules { - LIST, - element module_entry { - LIST, - element listentry { text }* - }* - }* - }* - }? & - element formatted { BOOLEAN }? & - element model { text }? & - element old_unique_key { text }? & - element partition_info { text }? & - element prog_if { INTEGER }? & - element resource { - element disk_log_geo { - LIST, - element listentry { - element cylinders { INTEGER }? & - element heads { INTEGER }? & - element sectors { INTEGER }? - }* - }? & - element io { - LIST, - element listentry { - element active { BOOLEAN }? & - element length { INTEGER }? & - element mode { text }? & - element start { INTEGER }? - }* - }? & - element size { - LIST, - element listentry { - element unit { text }? & - element x { INTEGER }? & - element y { INTEGER }? - }* - }? - }? & - element sub_class_id { INTEGER }? & - element sub_device_id { INTEGER }? & - element sysfs_bus_id { text }? & - element udi { text }? & - element unique_key { text }? & - element vendor { text }? & - element vendor_id { INTEGER }? + element channel { text } & + element format { BOOLEAN }? & + element diag { BOOLEAN }? }* }? } - Modified: trunk/s390/src/config/zfcp.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/config/zfcp.rnc?rev=674… ============================================================================== --- trunk/s390/src/config/zfcp.rnc (original) +++ trunk/s390/src/config/zfcp.rnc Fri Feb 17 14:42:48 2012 @@ -2,15 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" - zfcp = element zfcp { element devices { LIST, element listentry { - element controller_id { text }? & - element fcp_lun { text }? & - element wwpn { text }? + element controller_id { text } & + element wwpn { text } & + element fcp_lun { text } }* }? } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67470 - /tags/stable-2_21_5/nfs-client/
by mfilka＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: mfilka Date: Fri Feb 17 14:19:27 2012 New Revision: 67470 URL: http://svn.opensuse.org/viewcvs/yast?rev=67470&view=rev Log: Created tag stable-2_21_5 for nfs-client Added: tags/stable-2_21_5/nfs-client/ (props changed) - copied from r67469, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67469 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/routines.ycp testsuite/tests/r-check.out testsuite/tests/r-check.ycp testsuite/tests/r-spec.out testsuite/tests/r-spec.ycp
by mfilka＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: mfilka Date: Fri Feb 17 14:18:54 2012 New Revision: 67469 URL: http://svn.opensuse.org/viewcvs/yast?rev=67469&view=rev Log: IPv6 addresses supported - bnc#719538 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/routines.ycp trunk/nfs-client/testsuite/tests/r-check.out trunk/nfs-client/testsuite/tests/r-check.ycp trunk/nfs-client/testsuite/tests/r-spec.out trunk/nfs-client/testsuite/tests/r-spec.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67469&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Fri Feb 17 14:18:54 2012 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Fri Feb 17 14:18:54 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 17 13:14:44 UTC 2012 - mfilka(a)suse.com + +- IPv6 addresses supported - bnc#719538 +- updated testsuite +- 2.21.5 + +------------------------------------------------------------------- Thu Feb 16 13:16:18 UTC 2012 - mfilka(a)suse.com - removed some dead code, whitespaces Modified: trunk/nfs-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/routines.ycp?rev=… ============================================================================== --- trunk/nfs-client/src/routines.ycp (original) +++ trunk/nfs-client/src/routines.ycp Fri Feb 17 14:18:54 2012 @@ -23,17 +23,29 @@ import "Package"; import "Report"; + import "IP"; + import "String"; /** * @param spec "server:/path/specification" * @return `couple("server", "/path/specification") */ define term SpecToServPath(string spec) ``{ - integer colonpos = findfirstof(spec, ":"); + // split using ":/" (because of IPv6) + integer path_begin = search( spec, ":/"); string serv = ""; - if (colonpos != nil) { - serv = substring(spec, 0, colonpos); - spec = substring(spec, colonpos+1); + + // no :/ inside => <server>: or [/]<path> + if( path_begin == nil ) + { + if(spec == filterchars(spec, "-_." + String::CAlnum() ) + ":") + // matches [a-zA-Z0-1.-_] and ends with colon? => <server>: + path_begin = size( spec) -1; + } + + if (path_begin != nil) { + serv = substring(spec, 0, path_begin); + spec = substring(spec, path_begin+1); } return `couple(serv, spec); } @@ -68,16 +80,22 @@ * @return whether valid */ define boolean CheckHostName(string name) ``{ + string dirname_forbidden = ":"; + if (size(name) > 0 && size(name) < 50 && - name == filterchars(name, - "-_.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")) { + name == filterchars(name, "-_.:" + String::CAlnum() )) { + if( IP::Check( name)) + return true; + if( "" != filterchars( name, dirname_forbidden)) + return false; + return true; } else // error popup message Report::Error (sformat(_("The hostname entered is invalid. It must be shorter than 50 characters and only use -0-9, A-Z, a-z, dots, -, and _."))); +0-9, A-Z, a-z, dots, -, and _.:"))); return false; }; Modified: trunk/nfs-client/testsuite/tests/r-check.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-che… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-check.out (original) +++ trunk/nfs-client/testsuite/tests/r-check.out Fri Feb 17 14:18:54 2012 @@ -14,3 +14,6 @@ Return false Return false Return false +Return true +Return false +Return true Modified: trunk/nfs-client/testsuite/tests/r-check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-che… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-check.ycp (original) +++ trunk/nfs-client/testsuite/tests/r-check.ycp Fri Feb 17 14:18:54 2012 @@ -19,6 +19,9 @@ string OK_Name = "foo.bar.com.tw"; string TooLongName = "123456789012345678901234567890123456789012345678901234567890"; string IllegalName = "Something:wrong"; + string IPv4 = "192.168.10.1"; + string IPv4_invalid= "192.168.10:1"; + string IPv6 = "fe80::219:d1ff:feac:fd10"; DUMP ("check_options"); TEST (``(check_options ("")), [], nil); @@ -37,5 +40,9 @@ TEST (``(CheckHostName (TooLongName)), [], nil); TEST (``(CheckHostName (IllegalName)), [], nil); // Too long & illegal char - TEST (``(CheckHostName (TooLongName + ":")), [], nil); + TEST (``(CheckHostName (TooLongName + "!")), [], nil); + // check IPv? adresses + TEST (``(CheckHostName (IPv4)), [], nil); + TEST (``(CheckHostName (IPv4_invalid)), [], nil); + TEST (``(CheckHostName (IPv6)), [], nil); } Modified: trunk/nfs-client/testsuite/tests/r-spec.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-spe… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-spec.out (original) +++ trunk/nfs-client/testsuite/tests/r-spec.out Fri Feb 17 14:18:54 2012 @@ -4,5 +4,5 @@ Return `couple ("", "nocolon.only.server.com") Return `couple ("", "/only/path") Return `couple ("", "/nocolon/only/path") -Return `couple ("two", "colons:used") +Return `couple ("fe80::219:d1ff:feac:fd10", "/path") Return `couple ("", "") Modified: trunk/nfs-client/testsuite/tests/r-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-spe… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-spec.ycp (original) +++ trunk/nfs-client/testsuite/tests/r-spec.ycp Fri Feb 17 14:18:54 2012 @@ -22,6 +22,6 @@ TEST (``(SpecToServPath ("nocolon.only.server.com")), [], nil); TEST (``(SpecToServPath (":/only/path")), [], nil); TEST (``(SpecToServPath ("/nocolon/only/path")), [], nil); - TEST (``(SpecToServPath ("two:colons:used")), [], nil); + TEST (``(SpecToServPath ("fe80::219:d1ff:feac:fd10:/path")), [], nil); TEST (``(SpecToServPath ("")), [], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67468 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 11:39:27 2012 New Revision: 67468 URL: http://svn.opensuse.org/viewcvs/yast?rev=67468&view=rev Log: - improved logging - tiny optimization Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 17 11:39:27 2012 @@ -99,11 +99,10 @@ string GetDeviceName(string channel) { - string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); - map<string, any> disk = (map<string, any>) SCR::Execute(.target.bash_output, cmd); - if (disk["exit"]:-1 == 0 && !isempty(disk["stdout"]:"")) - return sformat("/dev/%1", disk["stdout"]:""); - + string dir = sformat("/sys/bus/ccw/devices/%1/block/", channel); + list<string> files = (list<string>) SCR::Read(.target.dir, dir); + if (size(files) == 1) + return "/dev/" + files[0]:""; return nil; } @@ -480,20 +479,17 @@ /** - * Activate selected Disks + * Activate disk * @param channel string Name of the disk to activate * @param diag boolean Activate DIAG or not */ global void ActivateDisk(string channel, boolean diag) { - string command = sformat ( - "/sbin/dasd_configure '%1' '%2' '%3'", - channel, - 1, - diag ? 1 : 0 - ); - integer ret = (integer)SCR::Execute (.target.bash, command); - y2milestone ("Running command %1 with exit code %2", command, ret); + string command = sformat("/sbin/dasd_configure '%1' %2 %3", channel, 1, diag ? 1 : 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + if (ret == 8) { string popup = sformat (_("Device %1 is not formatted. Format device now? @@ -518,32 +514,33 @@ DeactivateDisk(channel, diag); } else { - ReportActivationError (channel, ret); + ReportActivationError(channel, ret); } + disk_configured = true; } + /** - * Activate selected Disks + * Deactivate disk * @param channel string Name of the disk to deactivate * @param diag boolean Activate DIAG or not */ global void DeactivateDisk(string channel, boolean diag) { - string command = sformat ( - "/sbin/dasd_configure '%1' '%2' '%3'", - channel, - 0, - diag ? 1 : 0 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/dasd_configure '%1' %2 %3", channel, 0, diag ? 1 : 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + /** - * Activate selected Disks + * Format disks * @param disks_list list<string> List of disks to be formated * @param par integer Number of disks that can be formated in parallel * @param write_vl boolean Write a Volume label Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 17 11:39:27 2012 @@ -471,16 +471,14 @@ { if (! activated_controllers[channel]:false) { - string command = sformat ( - "/sbin/zfcp_host_configure '%1' '%2'", - channel, - 1 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); + string command = sformat("/sbin/zfcp_host_configure '%1' %2", channel, 1); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + if (ret != 0) { - ReportControllerActivationError (channel, ret); + ReportControllerActivationError(channel, ret); } else { @@ -488,20 +486,18 @@ } } - string command = sformat ( - "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", - channel, - // bugzilla #205503 - HexNumSize (wwpn, 16), - HexNumSize (lun, 16), - 1 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, + HexNumSize(wwpn, 16), HexNumSize(lun, 16), 1); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + /** * Activate a disk * @param channel string channel id @@ -510,20 +506,18 @@ */ global void DeactivateDisk(string channel, string wwpn, string lun) { - string command = sformat ( - "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", - channel, - // bugzilla #205503 - HexNumSize (wwpn, 16), - HexNumSize (lun, 16), - 0 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, + HexNumSize(wwpn, 16), HexNumSize(lun, 16), 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + list<string> runCommand(string cmd){ list<string> ret = []; map<string, any> cmd_output = (map<string, any>)SCR::Execute(.target.bash_output, cmd); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67467 - in /trunk/s390/src: dasd/dialogs.ycp dasd/helps.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 16:32:06 2012 New Revision: 67467 URL: http://svn.opensuse.org/viewcvs/yast?rev=67467&view=rev Log: - cleanup Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/helps.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Thu Feb 16 16:32:06 2012 @@ -9,7 +9,6 @@ { textdomain "s390"; -import "Arch"; import "DASDController"; import "Label"; import "Mode"; Modified: trunk/s390/src/dasd/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/helps.ycp?rev=6746… ============================================================================== --- trunk/s390/src/dasd/helps.ycp (original) +++ trunk/s390/src/dasd/helps.ycp Thu Feb 16 16:32:06 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; /** @@ -73,22 +71,17 @@ /* Disk add help 1/3 */ "disk_add_config" : _("<big>Add New DASD Disk</big> To add a disk, enter the Channel Number of the DASD disk as -identifier.") +identifier.") + -+ /* Disk add help 1/3 */ _("If the disk should be formatted, use Format the Disk. -") +") + -+ -(Arch::s390_32 () - /* Disk add help 3/3, optional */ - ? _("To use DIAG mode, select Use DIAG. + /* Disk add help 3/3 */ + _("To use DIAG mode, select Use DIAG. ") - : ""), ]; -/* EOF */ } Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 16 16:32:06 2012 @@ -15,7 +15,6 @@ import "Mode"; import "Report"; -import "Arch"; import "FileUtils"; import "Popup"; import "String"; @@ -487,7 +486,6 @@ */ global void ActivateDisk(string channel, boolean diag) { -// if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", channel, @@ -532,7 +530,6 @@ */ global void DeactivateDisk(string channel, boolean diag) { - // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", channel, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67466 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 15:18:01 2012 New Revision: 67466 URL: http://svn.opensuse.org/viewcvs/yast?rev=67466&view=rev Log: - moved functionality to module Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Thu Feb 16 15:18:01 2012 @@ -543,10 +543,7 @@ "diag" : diag, ]; - integer index = 0; - while (haskey (DASDController::devices, index)) - index = index + 1; - DASDController::devices[index] = d; + DASDController::AddDevice(d); } return ret; @@ -566,10 +563,15 @@ } list<integer> selected = ListSelectedDASD(); - - DASDController::devices = filter(integer index, map<string, any> d, DASDController::devices, { - return !contains(selected, index); - }); + if (isempty(selected)) + { + // error popup message + Popup::Message (_("No disk selected.")); + } + else + { + foreach(integer index, selected, { DASDController::RemoveDevice(index); }); + } return `next; } Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 16 15:18:01 2012 @@ -275,6 +275,23 @@ } + global void + AddDevice(map<string, any> d) + { + integer index = 0; + while (haskey(devices, index)) + index = index + 1; + devices[index] = d; + } + + + global void + RemoveDevice(integer index) + { + devices = remove(devices, index); + } + + global integer GetDeviceIndex(string channel) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67465 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/Nfs.ycp src/ui.ycp
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 14:22:19 2012 New Revision: 67465 URL: http://svn.opensuse.org/viewcvs/yast?rev=67465&view=rev Log: removed some dead code, whitespaces Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 14:22:19 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 16 13:16:18 UTC 2012 - mfilka(a)suse.com + +- removed some dead code, whitespaces + +------------------------------------------------------------------- Thu Feb 16 12:44:04 UTC 2012 - mfilka(a)suse.com - autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67465… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 14:22:19 2012 @@ -82,7 +82,7 @@ list<string> created_dirs = []; boolean ReadNfs4 () { - return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); } string ReadIdmapd() { @@ -375,11 +375,6 @@ return false; } -/* if (size (nfs_entries) == 0) - { - // Service::Adjust ("nfs", "disable"); // what if autofs needs it? - }*/ - portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { @@ -636,8 +631,8 @@ return true; } - /** - * Return required packages for auto-installation + /** + * Return required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67465&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 14:22:19 2012 @@ -129,7 +129,7 @@ /* Return convenient hostname (FaTE #302863) to be proposed * i.e. nfs + current domain (nfs. + suse.cz) - * @return string proposed hostname + * @return string proposed hostname */ define string ProposeHostname() { string ret = ""; @@ -586,7 +586,7 @@ EnableDisableButtons(); } - + void InitSettings( ) { CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); @@ -594,16 +594,16 @@ UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); } - + void SaveFstabEntries( ) { Nfs::nfs_entries = nfs_entries; } - + void SaveSettings( map event ) { CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); - Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value); } @@ -613,9 +613,6 @@ // handle the events, enable/disable the button, show the popup if button clicked if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) ) CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", $[ "ID" : widget ]); - /*changed = - true || // TODO: fw changed, #44106 - true; // TODO: nfs changed*/ if ( UI::WidgetExists(`id(`fstable)) ) entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); @@ -719,7 +716,7 @@ do { - event = UI::WaitForEvent (); + event = UI::WaitForEvent (); ret = event["ID"]:nil; if (ret == `ok) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67464 - /tags/stable-2_21_4/nfs-client/
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:49:24 2012 New Revision: 67464 URL: http://svn.opensuse.org/viewcvs/yast?rev=67464&view=rev Log: Created tag stable-2_21_4 for nfs-client Added: tags/stable-2_21_4/nfs-client/ (props changed) - copied from r67463, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67463 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/Nfs.ycp
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:47:25 2012 New Revision: 67463 URL: http://svn.opensuse.org/viewcvs/yast?rev=67463&view=rev Log: autoinstallation fails to enable rpcbind / portmapper - bnc#744357 Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 13:47:25 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 16 12:44:04 UTC 2012 - mfilka(a)suse.com + +- autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 +- 2.21.4 + +------------------------------------------------------------------- Thu Feb 16 12:23:00 UTC 2012 - mfilka(a)suse.com - accepted comments from earlier review. Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67463… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 13:47:25 2012 @@ -380,6 +380,7 @@ // Service::Adjust ("nfs", "disable"); // what if autofs needs it? }*/ + portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { Service::Enable( portmapper ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67462 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/Nfs.ycp src/ui.ycp yast2-nfs-client.spec.in
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:43:13 2012 New Revision: 67462 URL: http://svn.opensuse.org/viewcvs/yast?rev=67462&view=rev Log: Accepted comments from 2.21.3 review Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp trunk/nfs-client/yast2-nfs-client.spec.in Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67462&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Thu Feb 16 13:43:13 2012 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 13:43:13 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 16 12:23:00 UTC 2012 - mfilka(a)suse.com + +- accepted comments from earlier review. +- some formatting +- 2.21.4 + +------------------------------------------------------------------- Wed Feb 8 12:00:10 UTC 2012 - mfilka(a)suse.com - Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67462… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 13:43:13 2012 @@ -137,22 +137,23 @@ } }); - //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts - //thus we need to keep info on nfs version (v3 vs. v4) - //But older AY profiles might not contain this element - //so let's assume nfsv3 in that case (#395850) - if ( !haskey(s, "vfstype") ) - { - s["vfstype"] = "nfs"; - } else { - if (s["vfstype"]:"nfs" == "nfs4") - { - nfs4_enabled = true; - } - } + //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts + //thus we need to keep info on nfs version (v3 vs. v4) + //But older AY profiles might not contain this element + //so let's assume nfsv3 in that case (#395850) + if ( !haskey(s, "vfstype") ) + { + s["vfstype"] = "nfs"; + } else { + if (s["vfstype"]:"nfs" == "nfs4") + { + nfs4_enabled = true; + } + } return s; }); + if (missing) { return false; @@ -305,10 +306,10 @@ Progress::set(progress_orig); portmapper = FindPortmapper(); - //There is neither rpcbind nor portmap + //There is neither rpcbind nor portmap if ( portmapper == "" ) { - //so let's install rpcbind (default since #423026) + //so let's install rpcbind (default since #423026) required_packages = add( required_packages, "rpcbind" ); portmapper = "rpcbind"; } Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67462&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 13:43:13 2012 @@ -223,9 +223,7 @@ foreach( map nfs_entry, nfs_entries, { term couple = SpecToServPath( nfs_entry[ "spec"]:""); - string known_server = ""; - - known_server = couple[0]:""; + string known_server = couple[0]:""; if( !contains( servers, known_server)) servers = add( servers, known_server); Modified: trunk/nfs-client/yast2-nfs-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/yast2-nfs-client.spec… ============================================================================== --- trunk/nfs-client/yast2-nfs-client.spec.in (original) +++ trunk/nfs-client/yast2-nfs-client.spec.in Thu Feb 16 13:43:13 2012 @@ -21,6 +21,7 @@ BuildArch: noarch Summary: YaST2 - NFS Configuration +Url: http://en.opensuse.org/Portal:YaST %description The YaST2 component for configuration of NFS. NFS stands for network -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67461 - in /trunk/s390/src/clients: dasd.desktop zfcp.desktop
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 12:36:37 2012 New Revision: 67461 URL: http://svn.opensuse.org/viewcvs/yast?rev=67461&view=rev Log: - unified desktop files Modified: trunk/s390/src/clients/dasd.desktop trunk/s390/src/clients/zfcp.desktop Modified: trunk/s390/src/clients/dasd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd.desktop?re… ============================================================================== --- trunk/s390/src/clients/dasd.desktop (original) +++ trunk/s390/src/clients/dasd.desktop Thu Feb 16 12:36:37 2012 @@ -21,5 +21,5 @@ Exec=xdg-su -c "/sbin/yast2 dasd" Name=DASD -GenericName=Configure dasd +GenericName=Configure DASD StartupNotify=true Modified: trunk/s390/src/clients/zfcp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp.desktop?re… ============================================================================== --- trunk/s390/src/clients/zfcp.desktop (original) +++ trunk/s390/src/clients/zfcp.desktop Thu Feb 16 12:36:37 2012 @@ -20,6 +20,6 @@ Icon=yast-zfcp Exec=xdg-su -c "/sbin/yast2 zfcp" -Name=Zfcp -GenericName=Configure zfcp +Name=ZFCP +GenericName=Configure ZFCP StartupNotify=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67460 - /trunk/s390/src/clients/s390-disk-controller.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 12:12:06 2012 New Revision: 67460 URL: http://svn.opensuse.org/viewcvs/yast?rev=67460&view=rev Log: - removed one of two return statements Modified: trunk/s390/src/clients/s390-disk-controller.ycp Modified: trunk/s390/src/clients/s390-disk-controller.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/s390-disk-contr… ============================================================================== --- trunk/s390/src/clients/s390-disk-controller.ycp (original) +++ trunk/s390/src/clients/s390-disk-controller.ycp Thu Feb 16 12:12:06 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("S/390 Controller module started"); @@ -94,15 +87,11 @@ } UI::CloseDialog(); -return ret; y2debug("ret=%1", ret); -/* Finish */ y2milestone("S/390 controller module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67459 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 11:42:21 2012 New Revision: 67459 URL: http://svn.opensuse.org/viewcvs/yast?rev=67459&view=rev Log: - removed unneeded scope operator Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 16 11:42:21 2012 @@ -279,7 +279,7 @@ GetDeviceIndex(string channel) { integer ret = nil; - foreach(integer index , map<string, any> d, DASDController::devices, { + foreach(integer index , map<string, any> d, devices, { if (d["channel"]:"0.0.0000" == channel) ret = index; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67458 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 18:24:56 2012 New Revision: 67458 URL: http://svn.opensuse.org/viewcvs/yast?rev=67458&view=rev Log: - fixed mode queries in Read and Write Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 18:24:56 2012 @@ -124,13 +124,17 @@ { ProbeDisks(); - if (Mode::config()) // TODO + if (!Mode::normal()) { + devices = filter(integer index, map<string, any> d, devices, { + return d["resource", "io", 0, "active"]:false; + }); + devices = mapmap(integer index, map<string, any> d, devices, { - d["format"] = d["format"]:false; - d["diag"] = d["diag"]:false; - return $[ index : d ]; - }); + d["format"] = d["format"]:false; + d["diag"] = d["diag"]:false; + return $[ index : d ]; + }); } disk_configured = false; @@ -144,50 +148,50 @@ */ global boolean Write() { - if (Mode::config()) // TODO + if (!Mode::normal()) { - list<string> to_format = []; - - foreach(integer index, map<string, any> device, devices, { - string channel = device["channel"]:""; - boolean format = device["format"]:false; - boolean do_diag = device["diag"]:false; - ActivateDisk(channel, do_diag); + list<string> to_format = []; - if (format) - { - string dev_name = GetDeviceName(channel); - if (dev_name != nil) - to_format = add(to_format, dev_name); - } - }); + foreach(integer index, map<string, any> device, devices, { + string channel = device["channel"]:""; + boolean format = device["format"]:false; + boolean do_diag = device["diag"]:false; + ActivateDisk(channel, do_diag); + + if (format) + { + string dev_name = GetDeviceName(channel); + if (dev_name != nil) + to_format = add(to_format, dev_name); + } + }); - y2milestone ("Disks to format: %1", to_format); + y2milestone ("Disks to format: %1", to_format); - if (!isempty(to_format)) - FormatDisks(to_format, 8, true); + if (!isempty(to_format)) + FormatDisks(to_format, 8, true); } - if (disk_configured && Mode::normal ()) + if (!Mode::installation()) { - // popup label - UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + if (disk_configured) + { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); - string command = "/sbin/mkinitrd && /sbin/zipl"; - y2milestone ("Running command %1", command); - any ret = SCR::Execute (.target.bash, command); - y2milestone ("Exit code: %1", ret); + string command = "/sbin/mkinitrd && /sbin/zipl"; + y2milestone("Running command %1", command); + any ret = SCR::Execute(.target.bash, command); + y2milestone ("Exit code: %1", ret); - UI::CloseDialog(); - } - else - { - y2milestone ("No new disk configured"); + UI::CloseDialog(); + } } return true; } + /** * Get all controller settings from the first parameter * (For use by autoinstallation.) @@ -198,7 +202,7 @@ { integer index = -1; devices = listmap (map<string, any> d, settings["devices"]:[], { - index = index + 1; + index = index + 1; d = filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); @@ -588,7 +592,7 @@ string line = (string) SCR::Read(.process.read_line, process_id); if (line == nil) break; - + integer siz = tointeger (line); if (siz == 0) siz = 999999999; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67457 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 18:00:00 2012 New Revision: 67457 URL: http://svn.opensuse.org/viewcvs/yast?rev=67457&view=rev Log: - added popup while running mkinitrd and zipl Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 18:00:00 2012 @@ -37,6 +37,9 @@ global boolean GetModified(); +/** + * Have DASDs been configured so that mkinitrd and zipl need to be run? + */ boolean disk_configured = false; @@ -167,10 +170,15 @@ if (disk_configured && Mode::normal ()) { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone ("Running command %1", command); any ret = SCR::Execute (.target.bash, command); y2milestone ("Exit code: %1", ret); + + UI::CloseDialog(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67456 - in /trunk/s390/testsuite/tests: S390.out S390.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 17:01:51 2012 New Revision: 67456 URL: http://svn.opensuse.org/viewcvs/yast?rev=67456&view=rev Log: - adapted testsuite Modified: trunk/s390/testsuite/tests/S390.out trunk/s390/testsuite/tests/S390.ycp Modified: trunk/s390/testsuite/tests/S390.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/testsuite/tests/S390.out?re… ============================================================================== --- trunk/s390/testsuite/tests/S390.out (original) +++ trunk/s390/testsuite/tests/S390.out Wed Feb 15 17:01:51 2012 @@ -1,2 +1,2 @@ -Dump DASDController::Modified +Dump DASDController::GetModified Return false Modified: trunk/s390/testsuite/tests/S390.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/testsuite/tests/S390.ycp?re… ============================================================================== --- trunk/s390/testsuite/tests/S390.ycp (original) +++ trunk/s390/testsuite/tests/S390.ycp Wed Feb 15 17:01:51 2012 @@ -7,7 +7,7 @@ import "DASDController"; -DUMP("DASDController::Modified"); -TEST(``(DASDController::Modified()), [], nil); +DUMP("DASDController::GetModified"); +TEST(``(DASDController::GetModified()), [], nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67455 - /trunk/s390/yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 16:58:11 2012 New Revision: 67455 URL: http://svn.opensuse.org/viewcvs/yast?rev=67455&view=rev Log: - updated build-requires Modified: trunk/s390/yast2-s390.spec.in Modified: trunk/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/yast2-s390.spec.in?rev=6745… ============================================================================== --- trunk/s390/yast2-s390.spec.in (original) +++ trunk/s390/yast2-s390.spec.in Wed Feb 15 16:58:11 2012 @@ -4,7 +4,7 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: yast2 yast2-devtools yast2-testsuite +BuildRequires: yast2 yast2-devtools yast2-testsuite yast2-users yast2-bootloader ExclusiveArch: s390 s390x Requires: yast2 s390-tools -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67454 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:53:47 2012 New Revision: 67454 URL: http://svn.opensuse.org/viewcvs/yast?rev=67454&view=rev Log: and implement injection of last exception message Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Wed Feb 15 16:53:47 2012 @@ -56,6 +56,17 @@ #include "Y2RubyTypeConv.h" +void inject_last_exception_method(VALUE& module,const string& message, const string& module_name) +{ + //doing injection from C++ is quite complex, but we have eval, so we can do it in ruby :) + string code("module "); + code += module_name; + code += "\ndef self.last_exception\n'"; + code += message; + code += "'\nend\nend"; + rb_funcall(module, rb_intern("eval"), 1, rb_str_new2(code.c_str())); +} + static void prependModulePath() { YCPPathSearch::initialize (); @@ -248,6 +259,7 @@ { return YCPString(StringValuePtr(reason)); } + inject_last_exception_method(module,StringValuePtr(reason),module_name); return YCPVoid(); } else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67453 - /trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:51:53 2012 New Revision: 67453 URL: http://svn.opensuse.org/viewcvs/yast?rev=67453&view=rev Log: make test really fail if it doesn't return what we want Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Wed Feb 15 16:51:53 2012 @@ -8,10 +8,13 @@ { result = tostring(InRuby::last_exception()); y2milestone("result: %1", result); + if(result != "Wow exception!") + return false; } else { y2error("exception completely ignored result: %1",result); + return false; } import "CamelCase"; result = tostring(CamelCase::inc(10)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67452 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:31:10 2012 New Revision: 67452 URL: http://svn.opensuse.org/viewcvs/yast?rev=67452&view=rev Log: fix memory leak in ruby bindings Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Wed Feb 15 16:31:10 2012 @@ -242,6 +242,7 @@ char* tmp = fmtstr("%s\n\t%s", StringValuePtr(reason), StringValuePtr(backtrace)); y2error("%s.%s failed\n%s", module_name.c_str(), function.c_str(), tmp); + free(tmp); //workaround if last_exception failed, then return always string with message if(function == "last_exception") //TODO constantify last_exception { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67451 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:26:08 2012 New Revision: 67451 URL: http://svn.opensuse.org/viewcvs/yast?rev=67451&view=rev Log: ensure that even if exception is raised we return correct result. Ensure also that for last_exception if exception is called, we still return string with message Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Wed Feb 15 16:26:08 2012 @@ -236,12 +236,18 @@ if (error) { VALUE exception = rb_gv_get("$!"); /* get last exception */ - VALUE reason = rb_funcall(exception, rb_intern("to_s"), 0 ); + VALUE reason = rb_funcall(exception, rb_intern("message"), 0 ); VALUE trace = rb_gv_get("$@"); /* get last exception trace */ VALUE backtrace = rb_funcall(trace, rb_intern("join"), 1, rb_str_new("\n\t", 2)); char* tmp = fmtstr("%s\n\t%s", StringValuePtr(reason), StringValuePtr(backtrace)); y2error("%s.%s failed\n%s", module_name.c_str(), function.c_str(), tmp); + //workaround if last_exception failed, then return always string with message + if(function == "last_exception") //TODO constantify last_exception + { + return YCPString(StringValuePtr(reason)); + } + return YCPVoid(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67450 - /trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:25:00 2012 New Revision: 67450 URL: http://svn.opensuse.org/viewcvs/yast?rev=67450&view=rev Log: improve test to get better result Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Wed Feb 15 16:25:00 2012 @@ -3,14 +3,15 @@ import "InRuby"; string result = tostring(InRuby::multiply_by_eight(10)); y2milestone("result: %1", result); - if (InRuby::raising_code()==nil) + result = tostring(InRuby::raising_code()); + if (result==nil) { - string result = tostring(InRuby::last_exception()); + result = tostring(InRuby::last_exception()); y2milestone("result: %1", result); } else { - y2error("exception completely ignored"); + y2error("exception completely ignored result: %1",result); } import "CamelCase"; result = tostring(CamelCase::inc(10)); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67449 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 16:24:13 2012 New Revision: 67449 URL: http://svn.opensuse.org/viewcvs/yast?rev=67449&view=rev Log: - removed unused parameter from FormatDisks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 16:24:13 2012 @@ -445,7 +445,7 @@ list<string> devices = maplist (integer id, selected, { return DASDController::devices[id, "dev_name"]:""; }); - DASDController::FormatDisks (devices, par, write_vl, true); + DASDController::FormatDisks(devices, par, write_vl); DASDController::ProbeDisks(); ReloadDASDDialog (); UI::SetFocus (`table); Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 16:24:13 2012 @@ -32,17 +32,12 @@ global void ActivateDisk (string channel, boolean diag); global void DeactivateDisk (string channel, boolean diag); global void ProbeDisks (); -global void FormatDisks (list<string> disks_list, integer par, - boolean write_vl, boolean interactive); +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl); global string GetPartitionInfo (string disk); - -boolean disk_configured = false; +global boolean GetModified(); -/** - * Prototypes - */ -global boolean Modified(); +boolean disk_configured = false; /** @@ -60,7 +55,8 @@ * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +global boolean() AbortFunction = GetModified; + /** * Abort function @@ -93,7 +89,8 @@ * Is this kind of disk controller available? * @return boolean true if it is */ -global boolean Available () { +global boolean Available() +{ return true; } @@ -124,7 +121,7 @@ { ProbeDisks(); - if (Mode::config()) + if (Mode::config()) // TODO { devices = mapmap(integer index, map<string, any> d, devices, { d["format"] = d["format"]:false; @@ -144,7 +141,7 @@ */ global boolean Write() { - if (Mode::config()) + if (Mode::config()) // TODO { list<string> to_format = []; @@ -165,7 +162,7 @@ y2milestone ("Disks to format: %1", to_format); if (!isempty(to_format)) - FormatDisks(to_format, 8, true, true); + FormatDisks(to_format, 8, true); } if (disk_configured && Mode::normal ()) @@ -214,12 +211,9 @@ global map<string, list> Export() { list<map<string, any> > l = maplist(integer i, map<string, any> d, devices, { - - d = filter(string k, any v, d, { + return filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); }); - - return d; }); return $[ "devices" : l ]; @@ -290,7 +284,7 @@ list<string> ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No - return sformat(_("Channel: %1, Format: %2, Use DIAG: %3"), d["channel"]:"", + return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); y2milestone ("Summary: %1", ret); @@ -485,8 +479,7 @@ string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ - FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); -// ReloadDASDDialog (); + FormatDisks([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true); ActivateDisk(channel, diag); } else { Popup::Error(sformat("Couldn't find device for %1 channel", channel)); @@ -528,10 +521,8 @@ * @param disks_list list<string> List of disks to be formated * @param par integer Number of disks that can be formated in parallel * @param write_vl boolean Write a Volume label - * @param interactive boolean Interactive yes/no */ -global void FormatDisks(list<string> disks_list, integer par, boolean write_vl, - boolean interactive) +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl) { if (par > size (disks_list)) par = size (disks_list); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67448 - /trunk/ruby-bindings/src/ruby/YRubyNamespace.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 15:54:23 2012 New Revision: 67448 URL: http://svn.opensuse.org/viewcvs/yast?rev=67448&view=rev Log: at first define method last_exception so you can call it from ycp Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRubyName… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRubyNamespace.cc (original) +++ trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Wed Feb 15 15:54:23 2012 @@ -253,6 +253,18 @@ enterSymbol (fun_se, 0); y2milestone("method: '%s' added", RSTRING(current)->ptr); } + //add to all modules method last_exception to get last exception raised inside module + constTypePtr sym_tp = Type::fromSignature("any()"); + // symbol entry for the function + SymbolEntry *fun_se = new SymbolEntry ( this, + i,// position. arbitrary numbering. + "last_exception", // passed to Ustring, no need to strdup + SymbolEntry::c_function, + sym_tp); + fun_se->setGlobal (true); + // enter it to the symbol table + enterSymbol (fun_se, 0); + y2milestone("method: 'last_exception' added"); y2milestone("%s", symbolsToString().c_str()); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67447 - /trunk/s390/src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 15:08:11 2012 New Revision: 67447 URL: http://svn.opensuse.org/viewcvs/yast?rev=67447&view=rev Log: - tiny simplification Modified: trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 15:08:11 2012 @@ -369,7 +369,7 @@ string problem = ""; foreach (integer id, selected, { boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"); + string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"; if (!active) { // error report, %1 is device identification -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67446 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 15:06:39 2012 New Revision: 67446 URL: http://svn.opensuse.org/viewcvs/yast?rev=67446&view=rev Log: - tiny simplification Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 15:06:39 2012 @@ -369,14 +369,14 @@ string problem = ""; foreach (integer id, selected, { boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - string access = toupper(DASDController::devices[id, "resource", "io", 0, "mode"]:"RO"); - if (! active) + string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"); + if (!active) { // error report, %1 is device identification problem = sformat (_("Disk %1 is not active."), DASDController::devices[id, "channel"]:""); } - else if (tolower (access) != "rw") + else if (access != "rw") { problem = sformat ( // error report, %1 is device identification Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 15:06:39 2012 @@ -378,6 +378,8 @@ return $[ index : d ]; }); + y2milestone("probed dasds %1", devices); + UI::CloseDialog (); } @@ -550,7 +552,6 @@ disks_param, par, additional_param); y2milestone ("Running command %1", command); - index = 0; term contents = `VBox (`HSpacing (70)); index = 0; while (index < par) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67445 - in /trunk/ruby-bindings/tests/ycp: InRuby.rb ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 15:00:15 2012 New Revision: 67445 URL: http://svn.opensuse.org/viewcvs/yast?rev=67445&view=rev Log: first test to play with exceptions in ruby-bindings ( I hope we switch to git in near future and hope that noone need to submit ruby-bindings until I implement it ) Modified: trunk/ruby-bindings/tests/ycp/InRuby.rb trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/tests/ycp/InRuby.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/InRuby.r… ============================================================================== --- trunk/ruby-bindings/tests/ycp/InRuby.rb (original) +++ trunk/ruby-bindings/tests/ycp/InRuby.rb Wed Feb 15 15:00:15 2012 @@ -2,4 +2,8 @@ def self.multiply_by_eight(n) n * 8 end + + def self.raising_code + raise "Wow exception!" + end end Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Wed Feb 15 15:00:15 2012 @@ -3,6 +3,15 @@ import "InRuby"; string result = tostring(InRuby::multiply_by_eight(10)); y2milestone("result: %1", result); + if (InRuby::raising_code()==nil) + { + string result = tostring(InRuby::last_exception()); + y2milestone("result: %1", result); + } + else + { + y2error("exception completely ignored"); + } import "CamelCase"; result = tostring(CamelCase::inc(10)); y2milestone("result: %1", result); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67444 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 14:52:22 2012 New Revision: 67444 URL: http://svn.opensuse.org/viewcvs/yast?rev=67444&view=rev Log: - added basic input checks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 14:52:22 2012 @@ -214,9 +214,6 @@ */ void ReloadDASDDialog() { - DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); - DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - list<term> items = GetDASDDiskItems(); list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); @@ -242,6 +239,20 @@ if (ret == `filter) { + string filter_min = (string) UI::QueryWidget(`min_chan, `Value); + string filter_max = (string) UI::QueryWidget(`max_chan, `Value); + + if (!DASDController::ValidChannel(filter_min) || !DASDController::ValidChannel(filter_max)) + { + // error popup + Popup::Error(_("Invalid filter channels.")); + ret = nil; + continue; + } + + DASDController::filter_min = filter_min; + DASDController::filter_max = filter_max; + ReloadDASDDialog (); ret = nil; continue; @@ -499,10 +510,24 @@ { ret = nil; } - } + } else if (ret == `next) { - // TODO check for duplicate channel + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + + if (!DASDController::ValidChannel(channel)) + { + // error popup + Popup::Error(_("Not a valid channel.")); + ret = nil; + } + + if (DASDController::GetDeviceIndex(channel) != nil) + { + // error popup + Popup::Error(_("Channel already exists.")); + ret = nil; + } } } @@ -511,7 +536,8 @@ string channel = (string) UI::QueryWidget(`id(`channel), `Value); boolean format = (boolean) UI::QueryWidget(`id(`format), `Value); boolean diag = (boolean) UI::QueryWidget(`id(`diag), `Value); - map<string,any> m = $[ + + map<string, any> d = $[ "channel" : channel, "format" : format, "diag" : diag, @@ -520,7 +546,7 @@ integer index = 0; while (haskey (DASDController::devices, index)) index = index + 1; - DASDController::devices[index] = m; + DASDController::devices[index] = d; } return ret; Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 14:52:22 2012 @@ -109,6 +109,13 @@ } + global boolean ValidChannel(string channel) + { + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + return regexpmatch(channel, regexp); + } + + /** * Read all controller settings * @return true on success @@ -261,6 +268,18 @@ return ret; } + + global integer + GetDeviceIndex(string channel) + { + integer ret = nil; + foreach(integer index , map<string, any> d, DASDController::devices, { + if (d["channel"]:"0.0.0000" == channel) + ret = index; + }); + return ret; + } + /** * Create a textual summary and a list of unconfigured cards -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67443 - /trunk/yast2/library/modules/FileUtils.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:17:24 2012 New Revision: 67443 URL: http://svn.opensuse.org/viewcvs/yast?rev=67443&view=rev Log: improve Exists(), don't return 'true' if SCR::Read() returned nil Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Wed Feb 15 14:17:24 2012 @@ -33,7 +33,7 @@ global define boolean Exists (string target) { map info = (map) SCR::Read(.target.stat, target); - if (info != $[]) { + if (info != $[] && info != nil) { return true; } return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67442 - /trunk/ycp-ui-bindings/examples/RichText2.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:12:27 2012 New Revision: 67442 URL: http://svn.opensuse.org/viewcvs/yast?rev=67442&view=rev Log: add tabs to example Modified: trunk/ycp-ui-bindings/examples/RichText2.ycp Modified: trunk/ycp-ui-bindings/examples/RichText2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText2.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText2.ycp Wed Feb 15 14:12:27 2012 @@ -4,8 +4,9 @@ `VBox( `RichText(`opt(`plainText), "This is a RichText in plainText mode.\n" - +"No HTML tags are supported here, but line breaks\n" - +"are output literally - as are HTML tags like or or &product;." + +"No HTML \t\ttags\tare\tsupported\there, tabs\tand\tline\tbreaks\n" + +"are output literally \n" + +"as are HTML tags like or or &product;." ), `PushButton(`opt(`default), "&OK") ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67441 - /trunk/ycp-ui-bindings/examples/LogView2.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:08:22 2012 New Revision: 67441 URL: http://svn.opensuse.org/viewcvs/yast?rev=67441&view=rev Log: add \n to lines (needed to work in text mode) Modified: trunk/ycp-ui-bindings/examples/LogView2.ycp Modified: trunk/ycp-ui-bindings/examples/LogView2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/LogView… ============================================================================== --- trunk/ycp-ui-bindings/examples/LogView2.ycp (original) +++ trunk/ycp-ui-bindings/examples/LogView2.ycp Wed Feb 15 14:08:22 2012 @@ -16,6 +16,7 @@ repeat { string line = tostring(random(100)); + line = line + "\n"; UI::ChangeWidget(`id(`log), `LastLine, line ); button = UI::TimeoutUserInput(100); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67440 - /trunk/ycp-ui-bindings/examples/RichText4.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:07:27 2012 New Revision: 67440 URL: http://svn.opensuse.org/viewcvs/yast?rev=67440&view=rev Log: more text (<tt> tag) Modified: trunk/ycp-ui-bindings/examples/RichText4.ycp Modified: trunk/ycp-ui-bindings/examples/RichText4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText4.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText4.ycp Wed Feb 15 14:07:27 2012 @@ -5,14 +5,23 @@ `RichText( "<h3>RichText example</h3>" + "This is a RichText widget." + "It's very much like HTML, but not quite as powerful." - + "bold and italic you can rely on." - + "-i-: keep the installed version and never update or delete it ( package locked )" - + " i : All requirements of this pattern/language are satisfied" + + "bold and italic you can rely on. " + + "But in text mode bold and italic it look the same." + + "Bold used for status:" + + "" + + "<pre>" + + "-i-: keep the installed version ( package locked ) " + + " i : All requirements of this pattern/language are satisfied" + + "</pre>" + + "" + + "Italic used for special info:" + + "Please read the Users Manual." + + "The <tt> typewriter tag is interpreted like bold in text mode." + + "<tt>This is text in <tt>, looks like bold text in text mode.</tt>" + "The product name is automatically replaced by the UI. " + "Use the special macro &product; for that." - + "" - + "The current product name is &product;." + "" + + "The current product name is &product;." ), `PushButton(`opt(`default), "&OK") ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67439 - in /trunk/s390/src: clients/dasd_auto.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 12:42:36 2012 New Revision: 67439 URL: http://svn.opensuse.org/viewcvs/yast?rev=67439&view=rev Log: - improved DASDController::modified handling - use switch statement Modified: trunk/s390/src/clients/dasd_auto.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/dasd_auto.ycp (original) +++ trunk/s390/src/clients/dasd_auto.ycp Wed Feb 15 12:42:36 2012 @@ -10,17 +10,7 @@ * goes through the configuration and return the setting. * Does not do any changes to the configuration. */ - -/** - * @param function to execute - * @param map/list of controller settings - * @return map edited settings, Summary or boolean on success depending on called function - * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("controller_auto", [ "Summary", mm ]); - */ - { - textdomain "s390"; y2milestone("----------------------------------------"); @@ -43,60 +33,88 @@ y2debug("func=%1", func); y2debug("param=%1", param); -/* Create a summary*/ -if(func == "Summary") { - ret = HTML::List(DASDController::Summary()); -} -/* Reset configuration */ -else if (func == "Reset") { - DASDController::Import($[]); - ret = $[]; -} -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = DASDAutoSequence(); -} -/* Import configuration */ -else if (func == "Import") { - ret = DASDController::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = DASDController::Export(); -} -/* did configuration change */ -else if (func == "GetModified") { - ret = DASDController::modified; -} -/* set configuration as changed */ -else if (func == "SetModified") { - DASDController::modified = true; - ret = true; -} -/* Return needed packages */ -else if (func == "Packages") { - ret = DASDController::AutoPackages(); -} -/* Read current state */ -else if (func == "Read") { - import "Progress"; - Progress::off(); - ret = DASDController::Read(); - Progress::on(); -} -/* Write given settings */ -else if (func == "Write") { - import "Progress"; - Progress::off(); - DASDController::write_only = true; - ret = DASDController::Write(); - Progress::on(); -} -/* Unknown function */ -else { - y2error("Unknown function: %1", func); - ret = false; -} + switch (func) + { + case "Summary": // Create a summary + { + ret = HTML::List(DASDController::Summary()); + break; + } + + case "Reset": // Reset configuration + { + DASDController::Import($[]); + DASDController::SetModified(true); + ret = $[]; + break; + } + + case "Change": // Change configuration + { + ret = DASDAutoSequence(); + DASDController::SetModified(true); + break; + } + + case "Import": // Import configuration + { + ret = DASDController::Import(param); + DASDController::SetModified(true); + break; + } + + case "Export": // Return actual state + { + ret = DASDController::Export(); + DASDController::SetModified(false); + break; + } + + case "GetModified": // Did configuration change + { + ret = DASDController::GetModified(); + break; + } + + case "SetModified": // Set configuration as changed + { + DASDController::SetModified(true); + ret = true; + break; + } + + case "Packages": // Return needed packages + { + ret = DASDController::AutoPackages(); + break; + } + + case "Read": // Read current state + { + import "Progress"; + Progress::off(); + ret = DASDController::Read(); + Progress::on(); + DASDController::SetModified(true); + break; + } + + case "Write": // Write given settings + { + import "Progress"; + Progress::off(); + ret = DASDController::Write(); + Progress::on(); + break; + } + + default: // Unknown function + { + y2error("Unknown function: %1", func); + ret = false; + break; + } + } y2debug("ret=%1", ret); y2milestone("DASD auto finished"); @@ -104,5 +122,4 @@ return ret; -/* EOF */ } Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 12:42:36 2012 @@ -44,20 +44,17 @@ */ global boolean Modified(); + /** * Data was modified? */ -global boolean modified = true; // TODO +boolean modified = false; + /** */ global boolean proposal_valid = false; -/** - * Write only, used during autoinstallation. - * Don't run services and SuSEconfig, it's all done at one place. - */ -global boolean write_only = false; /** * Abort function @@ -80,11 +77,18 @@ * Data was modified? * @return true if modified */ -global boolean Modified() { - y2debug("modified=%1",modified); +global boolean GetModified() +{ return modified; } + +global void SetModified(boolean value) +{ + modified = value; +} + + /** * Is this kind of disk controller available? * @return boolean true if it is @@ -113,11 +117,14 @@ { ProbeDisks(); - devices = mapmap(integer index, map<string, any> d, devices, { + if (Mode::config()) + { + devices = mapmap(integer index, map<string, any> d, devices, { d["format"] = d["format"]:false; d["diag"] = d["diag"]:false; return $[ index : d ]; - }); + }); + } disk_configured = false; return true; @@ -130,6 +137,8 @@ */ global boolean Write() { + if (Mode::config()) + { list<string> to_format = []; foreach(integer index, map<string, any> device, devices, { @@ -150,6 +159,7 @@ if (!isempty(to_format)) FormatDisks(to_format, 8, true, true); + } if (disk_configured && Mode::normal ()) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67438 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:41:24 2012 New Revision: 67438 URL: http://svn.opensuse.org/viewcvs/yast?rev=67438&view=rev Log: - Automatically save solver test case in the migration proposal dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case directory) (bnc#746313) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Feb 15 12:41:24 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz + +- Automatically save solver test case in the migration proposal + dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case + directory) (bnc#746313) + +------------------------------------------------------------------- Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz - do full migration only from SP2 repos (but also install patches Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Feb 15 12:41:24 2012 @@ -488,6 +488,8 @@ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); } + Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case"); + already_proposed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67437 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:40:32 2012 New Revision: 67437 URL: http://svn.opensuse.org/viewcvs/yast?rev=67437&view=rev Log: - do full migration only from SP2 repos (but also install patches in addition to minimal migration) (fate#311994) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_dup_repositories.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Feb 15 12:40:32 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz + +- do full migration only from SP2 repos (but also install patches + in addition to minimal migration) (fate#311994) + +------------------------------------------------------------------- Tue Jan 17 14:02:21 UTC 2012 - lslezak(a)suse.cz - ask user to confirm new licenses at upgrade proposal (bnc#741174) Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repo… ============================================================================== --- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Wed Feb 15 12:40:32 2012 @@ -156,7 +156,7 @@ // heading text string heading_text = _("Migration Type"); // full migration? - boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true)); + boolean full = Wagon::MigrationType() == `full; term contents = `VBox( // frame label @@ -168,7 +168,7 @@ // radio button `Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full)) + `Left(`RadioButton(`id(`full), _("&Full - install also available patches in addition to Minimal migration"), full)) ) ) ) @@ -200,6 +200,7 @@ list<integer> prev_dup_repos = Wagon::DupRepos(); boolean prev_manual_selection = Wagon::ManualRepoSelection(); + symbol prev_migration_type = Wagon::MigrationType(); while (true) { // go to advanced config it was used previously @@ -211,17 +212,9 @@ symbol mtype = (symbol) UI::QueryWidget(`id(`migration_type), `CurrentButton); y2milestone("Selected migration type: %1", mtype); - if (mtype == `full) + if (mtype == `full || mtype == `minimal) { - // DUP: all repositories - y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); - Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); - Wagon::SetManualRepoSelection(false); - } - else if (mtype == `minimal) - { - // DUP: only added repositories - y2milestone("Selected minimal migration, using these repositories: %1", Wagon::RegistrationRepos()); + y2milestone("Selected minimal or full migration, using these repositories: %1", Wagon::RegistrationRepos()); map<string, integer> alias_to_id = $[]; foreach(integer repo, Pkg::SourceGetCurrent(true), @@ -240,6 +233,7 @@ Wagon::SetDupRepos(added_repos); Wagon::SetManualRepoSelection(false); + Wagon::SetMigrationType(mtype); } else { @@ -273,6 +267,7 @@ else if (ret == `next) { Wagon::SetManualRepoSelection(true); + Wagon::SetMigrationType(`custom); break; } else if (ret == `back) @@ -292,7 +287,7 @@ } } - if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection())) + if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection() || prev_migration_type != Wagon::MigrationType())) { y2milestone("DUP repository config has been changed, repropose package selection"); Wagon::ResetDUPProposal(); Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Feb 15 12:40:32 2012 @@ -154,6 +154,34 @@ new_registration_repos = repos; } + // migration type, one of `minimal, `full, `custom + symbol migration_type = `minimal; + + // get the current migration type + global symbol MigrationType() + { + return migration_type; + } + + // set the migration type + // @param type Type of migration (`minimal, `full, `custom) + // @return boolean true on success + global boolean SetMigrationType(symbol type) + { + if (contains([`minimal, `full, `custom], type)) + { + migration_type = type; + y2milestone("Setting migration type: %1", type); + return true; + } + else + { + y2error("Invalid migration type: %1", type); + y2warning("Keeping the current type: %1", migration_type); + return false; + } + } + void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } @@ -430,65 +458,25 @@ list<integer> repos = Pkg::GetUpgradeRepos(); foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); - // all repositories selected for upgrade? - if (sort(Pkg::SourceGetCurrent(true)) == sort(dup_repos)) - { - // reset solver flags (needed when switching from full DUP to partial DUP - Pkg::SetSolverFlags($["reset" : true]); + // reset solver flags + Pkg::SetSolverFlags($["reset" : true]); - y2milestone("Migration products: %1", migration_products); + // add upgrade repositories + y2milestone("Adding upgrade repos: %1", dup_repos); + foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); - list<string> product_names = maplist(map prod, Pkg::ResolvableProperties ("", `product, ""), {return prod["name"]:"";}); - // remove duplicates - product_names = toset(product_names); - - foreach(string prod_name, product_names, - { - list<map> products_named = Pkg::ResolvableProperties(prod_name, `product, ""); - y2milestone("Product: %1, resolvables: %2", prod_name, size(products_named)); - - if (size(products_named) > 1) - { - boolean installed = find(map p, products_named, {return p["status"]:`unknown == `installed;}) != nil; - boolean selected = find(map p, products_named, {return p["status"]:`unknown == `selected;}) != nil; - boolean removed = find(map p, products_named, {return p["status"]:`unknown == `removed;}) != nil; - boolean available = find(map p, products_named, {return p["status"]:`unknown == `available;}) != nil; - - y2milestone("Product: %1, installed: %2, selected: %3, removed: %4, available: %5", prod_name, installed, selected, removed, available); - - // force upgrade of installed non-migration products - if (installed && !selected && !removed && available && !contains(migration_products, prod_name)) - { - y2milestone("Found installed product: %1, forcing product upgrade", prod_name); - Pkg::ResolvableInstall(prod_name, `product); - } - } - }); + // be compatible with "zypper dup --from" + Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); - foreach(string prod, migration_products, { - y2milestone("Removing migration product: %1", prod); - Pkg::ResolvableRemove(prod, `product); - }); - - // do full distribution upgrade - map <string, any> update_conf = GetUpdateConf(); - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); - y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + if (MigrationType() == `full) + { + // run the solver to evaluate applicable patches + Pkg::PkgSolve(false); - // also preselect all applicable patches (except optional ones) + // preselect all applicable patches (except optional ones) integer patches = Pkg::ResolvablePreselectPatches(`all); y2milestone("Preselected patches: %1", patches); } - else - { - // do partial DUP - // add upgrade repositories - y2milestone("Adding upgrade repos: %1", dup_repos); - foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); - - // be compatible with "zypper dup --from" - Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); - } // set the solve error flag for packages proposal Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67436 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:38:12 2012 New Revision: 67436 URL: http://svn.opensuse.org/viewcvs/yast?rev=67436&view=rev Log: - Automatically save solver test case in the migration proposal dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case directory) (bnc#746313) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Wed Feb 15 12:38:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz + +- Automatically save solver test case in the migration proposal + dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case + directory) (bnc#746313) + +------------------------------------------------------------------- Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz - do full migration only from SP2 repos (but also install patches Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Wed Feb 15 12:38:12 2012 @@ -487,6 +487,8 @@ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); } + Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case"); + already_proposed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67435 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:31:05 2012 New Revision: 67435 URL: http://svn.opensuse.org/viewcvs/yast?rev=67435&view=rev Log: - Automatically save solver test case in the migration proposal dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case directory) (bnc#746313) - 2.17.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Wed Feb 15 12:31:05 2012 @@ -1 +1 @@ -2.17.17.8 +2.17.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Feb 15 12:31:05 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz + +- Automatically save solver test case in the migration proposal + dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case + directory) (bnc#746313) +- 2.17.17.9 + +------------------------------------------------------------------- Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz - do full migration only from SP2 repos (but also install patches Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Wed Feb 15 12:31:05 2012 @@ -487,6 +487,8 @@ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); } + Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case"); + already_proposed = true; return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67434 - in /trunk/s390/src/dasd: dialogs.ycp wizards.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 12:15:43 2012 New Revision: 67434 URL: http://svn.opensuse.org/viewcvs/yast?rev=67434&view=rev Log: - implemented deleting of dasds in autoyast editor Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/wizards.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 12:15:43 2012 @@ -234,11 +234,11 @@ { DisplayDASDDialog (); ReloadDASDDialog (); - any ret = nil; + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); + ret = (symbol) UI::UserInput(); if (ret == `filter) { @@ -395,7 +395,7 @@ `PushButton (`id (`cancel), Label::CancelButton ()) ) )); - ret = UI::UserInput (); + ret = (symbol) UI::UserInput(); par = (integer) UI::QueryWidget(`id(`par), `Value); boolean write_vl = (boolean) UI::QueryWidget(`id(`write_label), `Value); UI::CloseDialog (); @@ -441,7 +441,7 @@ ret = nil; } } - return (symbol)ret; + return ret; } @@ -449,11 +449,11 @@ * Run the dialog for adding DASDs * @return symbol from AddDASDDiskDialog */ -symbol AddDASDDiskDialog () +symbol AddDASDDiskDialog() { - if (! Mode::config ()) + if (!Mode::config()) { - y2error ("DASD Add Disk dialog shouldn't be run in Mode::config ()"); + y2error("DASD Add Disk dialog shouldn't be run in Mode::config()"); return `back; } @@ -484,11 +484,12 @@ Wizard::RestoreBackButton (); Wizard::RestoreAbortButton (); - any ret = nil; + UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); + ret = (symbol) UI::UserInput(); if (ret == `abort || ret == `cancel) { @@ -522,7 +523,29 @@ DASDController::devices[index] = m; } - return (symbol) ret; + return ret; +} + + +/** + * Run the dialog for deleting DASDs + * @return symbol from DeleteDASDDiskDialog + */ +symbol DeleteDASDDiskDialog() +{ + if (!Mode::config()) + { + y2error("DASD Delete Disk dialog shouldn't be run in Mode::config()"); + return `back; + } + + list<integer> selected = ListSelectedDASD(); + + DASDController::devices = filter(integer index, map<string, any> d, DASDController::devices, { + return !contains(selected, index); + }); + + return `next; } } Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Wed Feb 15 12:15:43 2012 @@ -23,7 +23,8 @@ { map aliases = $[ "main" : ``(DASDDialog()), - "add" : ``(AddDASDDiskDialog()) + "add" : ``(AddDASDDiskDialog()), + "delete" : ``(DeleteDASDDiskDialog()) ]; map sequence = $[ @@ -32,10 +33,15 @@ `abort : `abort, `next : `next, `add : "add", + `delete : "delete" ], "add" : $[ `abort : `abort, - `next : "main", + `next : "main" + ], + "delete" : $[ + `abort : `abort, + `next : "main" ], ]; @@ -50,9 +56,9 @@ any DASDSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainDASDSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : [ ``(ReadDialog()), true ], + "main" : ``(MainDASDSequence()), + "write" : [ ``(WriteDialog()), true ] ]; map sequence = $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67433 - /tags/stable-2_22_4/installation/
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:50:19 2012 New Revision: 67433 URL: http://svn.opensuse.org/viewcvs/yast?rev=67433&view=rev Log: Created tag stable-2_22_4 for installation Added: tags/stable-2_22_4/installation/ - copied from r67432, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67432 - in /trunk/installation: VERSION package/yast2-installation.changes
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:48:38 2012 New Revision: 67432 URL: http://svn.opensuse.org/viewcvs/yast?rev=67432&view=rev Log: 2.22.4 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=67432&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Feb 15 11:48:38 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Feb 15 11:48:38 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 15 11:46:45 CET 2012 - gs(a)suse.de + +- Improve layout of the release notes dialog (bnc #550610) +- 2.22.4 + +------------------------------------------------------------------- Thu Feb 9 10:53:01 CET 2012 - jsuchome(a)suse.cz - adapt the style only for ssh installation, not vnc (bnc#742777) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67431 - in /trunk/s390: package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 11:46:23 2012 New Revision: 67431 URL: http://svn.opensuse.org/viewcvs/yast?rev=67431&view=rev Log: - make DASD module work for autoyast editor Modified: trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Wed Feb 15 11:46:23 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 15 11:25:49 CET 2012 - aschnell(a)suse.de + +- make DASD module work for autoyast editor + +------------------------------------------------------------------- Fri Feb 10 14:59:45 CET 2012 - aschnell(a)suse.de - used multiselection table in main DASD dialog Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 11:46:23 2012 @@ -72,7 +72,7 @@ if (Mode::config ()) { items = maplist (integer k, map<string,any> d, devices, { - string channel = d["channel_id"]:""; + string channel = d["channel"]:""; string diag = String::YesNo(d["diag"]:false); string format = String::YesNo(d["format"]:false); return `item(`id(k), channel, format, diag); @@ -217,8 +217,6 @@ DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - DASDController::ProbeDisks(); - list<term> items = GetDASDDiskItems(); list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); @@ -242,7 +240,8 @@ { ret = UI::UserInput(); - if (ret == `filter) { + if (ret == `filter) + { ReloadDASDDialog (); ret = nil; continue; @@ -269,6 +268,8 @@ DASDController::ActivateDisk(channel, diag); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -289,6 +290,8 @@ DASDController::DeactivateDisk(channel, diag); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -311,6 +314,8 @@ DASDController::ActivateDisk(channel, true); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -333,6 +338,8 @@ DASDController::ActivateDisk(channel, false); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -428,6 +435,7 @@ return DASDController::devices[id, "dev_name"]:""; }); DASDController::FormatDisks (devices, par, write_vl, true); + DASDController::ProbeDisks(); ReloadDASDDialog (); UI::SetFocus (`table); ret = nil; @@ -436,6 +444,7 @@ return (symbol)ret; } + /** * Run the dialog for adding DASDs * @return symbol from AddDASDDiskDialog @@ -489,19 +498,24 @@ { ret = nil; } + } + else if (ret == `next) + { + // TODO check for duplicate channel } } if (ret == `next) { - string channel = (string)UI::QueryWidget (`id (`channel), `Value); - boolean format = (boolean)UI::QueryWidget (`id (`format), `Value); - boolean diag = (boolean)UI::QueryWidget (`id (`diag), `Value); + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + boolean format = (boolean) UI::QueryWidget(`id(`format), `Value); + boolean diag = (boolean) UI::QueryWidget(`id(`diag), `Value); map<string,any> m = $[ - "channel_id" : channel, + "channel" : channel, "format" : format, "diag" : diag, ]; + integer index = 0; while (haskey (DASDController::devices, index)) index = index + 1; Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 11:46:23 2012 @@ -14,15 +14,13 @@ textdomain "s390"; import "Mode"; -import "Progress"; import "Report"; -import "Stage"; -import "Summary"; import "Arch"; import "FileUtils"; import "Popup"; import "String"; + global map<integer,map<string,any> > devices = $[]; global string filter_min = "0.0.0000"; @@ -49,7 +47,7 @@ /** * Data was modified? */ -global boolean modified = false; +global boolean modified = true; // TODO /** */ @@ -95,21 +93,64 @@ return true; } + + string GetDeviceName(string channel) + { + string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); + map<string, any> disk = (map<string, any>) SCR::Execute(.target.bash_output, cmd); + if (disk["exit"]:-1 == 0 && !isempty(disk["stdout"]:"")) + return sformat("/dev/%1", disk["stdout"]:""); + + return nil; + } + + /** * Read all controller settings * @return true on success */ -global boolean Read() { +global boolean Read() +{ + ProbeDisks(); + + devices = mapmap(integer index, map<string, any> d, devices, { + d["format"] = d["format"]:false; + d["diag"] = d["diag"]:false; + return $[ index : d ]; + }); + disk_configured = false; return true; - } + /** * Write all controller settings * @return true on success */ -global boolean Write() { +global boolean Write() +{ + list<string> to_format = []; + + foreach(integer index, map<string, any> device, devices, { + string channel = device["channel"]:""; + boolean format = device["format"]:false; + boolean do_diag = device["diag"]:false; + ActivateDisk(channel, do_diag); + + if (format) + { + string dev_name = GetDeviceName(channel); + if (dev_name != nil) + to_format = add(to_format, dev_name); + } + }); + + y2milestone ("Disks to format: %1", to_format); + + if (!isempty(to_format)) + FormatDisks(to_format, 8, true, true); + if (disk_configured && Mode::normal ()) { string command = "/sbin/mkinitrd && /sbin/zipl"; @@ -121,6 +162,7 @@ { y2milestone ("No new disk configured"); } + return true; } @@ -130,50 +172,19 @@ * @param settings The YCP structure to be imported. * @return boolean True on success */ -global boolean Import (map settings) { - if (Mode::config ()) - { +global boolean Import(map settings) +{ integer index = -1; - devices = listmap (map<string,any> d, settings["devices"]:[], { - index = index + 1; - return $[ index : d ]; - }); - } - else if (Stage::initial ()) - { - // activate all disks first - map<string,boolean> to_format = $[]; - foreach (map d, settings["devices"]:[], { - boolean format = d["format"]:false; - boolean do_diag = d["diag"]:false; - string channel = d["channel"]:""; - if (channel != "") - { - to_format[channel] = format; - ActivateDisk (channel, do_diag); - } - }); + devices = listmap (map<string, any> d, settings["devices"]:[], { + index = index + 1; - // now probe all disks to get the mapping between channel and device - ProbeDisks (); + d = filter(string k, any v, d, { + return contains([ "channel", "format", "diag" ], k); + }); - // now map the channels of the disks to format to devices - list<string> format_list = []; - foreach (integer i, map<string,any> d, devices, { - string channel = d["channel"]:""; - string device = d["dev_name"]:""; - if (channel != "" && device != "") - { - if (to_format[channel]:false) - format_list = add (format_list, device); - } + return $[ index : d ]; }); - y2milestone ("Disks to format: %1", format_list); - // now format the disks - if (size (format_list) > 0) - FormatDisks (format_list, 8, true, true); - } return true; } @@ -185,44 +196,16 @@ */ global map<string, list> Export() { - ProbeDisks(); - - if (Mode::config()) - { list<map<string, any> > l = maplist(integer i, map<string, any> d, devices, { - // if possible, use device by-path (bnc#591603) - string tmp = find(string s, d["dev_names"]:[], { - return String::StartsWith(s, "/dev/disk/by-path/"); - }); - if (tmp != nil) - d["dev_name"] = tmp; - return d; - }); - - l = filter(map<string, any> m, l, { - return m["resource", "io", 0, "active"]:false; - }); - /* - l = maplist(map<string, any> m, l, { - return filter(string k, any v, m, { - return contains([ "channel", "dev_name" ], k); + d = filter(string k, any v, d, { + return contains([ "channel", "format", "diag" ], k); }); - }); - */ - return $[ "devices" : l ]; - } - else - { - list<map<string, any> > l = maplist (integer i, map<string, any> d, devices, { - return $[ "channel" : d["channel"]:"", - "format" : false, - "diag" : false ]; - }); + return d; + }); return $[ "devices" : l ]; - } } @@ -276,25 +259,24 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map<string,any> d, devices, { - string s = ""; // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No - s = sformat (_("Channel ID: %1, Format: %2, Use DIAG: %3"), - d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false) - ); - return s; + return sformat(_("Channel: %1, Format: %2, Use DIAG: %3"), d["channel"]:"", + String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); y2milestone ("Summary: %1", ret); return ret; } + /** * Return packages needed to be installed and removed during * Autoinstallation to insure module has all needed software * installed. * @return map with 2 lists. */ -global map AutoPackages() { +global map AutoPackages() +{ return $[ "install":[], "remove":[] ]; } @@ -320,18 +302,16 @@ */ global void ProbeDisks() { -/* if (Mode::config ()) - return; */ - // popup label UI::OpenDialog (`Label (_("Reading Configured DASD Disks"))); list<map<string, any> > disks = (list<map<string, any> >) SCR::Read(.probe.disk); disks = filter (map<string, any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); - + disks = maplist (map<string,any> d, disks, { string channel = d["sysfs_bus_id"]:"0.0.0000"; d["channel"] = channel; + boolean active = d["resource", "io", 0, "active"]:false; if (active) { @@ -346,56 +326,29 @@ } d["formatted"] = formatted; d["partition_info"] = GetPartitionInfo (device); - } - string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); - if (FileUtils::Exists(diag_file)) - { - string use_diag = (string)SCR::Read(.target.string, diag_file); - diag[channel] = substring(use_diag, 0, 1) == "1"; + string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); + if (FileUtils::Exists(diag_file)) + { + string use_diag = (string) SCR::Read(.target.string, diag_file); + d["diag"] = substring(use_diag, 0, 1) == "1"; + diag[channel] = substring(use_diag, 0, 1) == "1"; + } } + d = filter(string k, any v, d, { return contains([ "channel", "diag", + "resource", "formatted", "partition_info", "dev_name", "detail", + "device_id", "sub_device_id" ], k); }); + return d; }); + integer index = -1; - DASDController::devices = listmap (map<string,any> d, disks, { + devices = listmap (map<string, any> d, disks, { index = index + 1; return $[ index : d ]; }); -/* -DASDController::devices = (map<integer,map<string,any> >) - SCR::Read (.target.ycp, "/root/dasddevices.ycp"); -$[ -0:$[ -"bus":"None", -"bus_hwcfg":"none", -"channel":"0.0.0150", -"class_id":262, -"detail":$["cu_model":233, "dev_model":10, "lcss":0], -"dev_name":"/dev/dasda", -"dev_names":["/dev/dasda"], -"dev_num":$["major":94, "minor":0, "range":4, "type":"b"], -"device":"DASD", -"device_id":276880, -"driver":"io_subchannel", -"drivers":[$["active":true, "modprobe":true, "modules":[["dasd_eckd_mod", ""]]]], -"formatted":true, -"model":"IBM DASD", -"old_unique_key":"N5EP.J4gQoPlOYuE", -"partition_info":"--", -"prog_if":1, -"resource":$["disk_log_geo":[$["cylinders":3339, "heads":15, "sectors":12]], "io":[$["active":true, "length":1, "mode":"rw", "start":336]], "size":[$["unit":"sectors", "x":601020, "y":4096]]], -"sub_class_id":0, -"sub_device_id":275344, -"sysfs_bus_id":"0.0.0150", -"unique_key":"kNlH.ALFATSt_U8F", -"vendor":"IBM", -"vendor_id":286721 -], -]; -*/ - UI::CloseDialog (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67430 - /trunk/installation/src/clients/inst_release_notes.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:46:23 2012 New Revision: 67430 URL: http://svn.opensuse.org/viewcvs/yast?rev=67430&view=rev Log: improve layout (use MarginBox), bnc #550610 Modified: trunk/installation/src/clients/inst_release_notes.ycp Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_re… ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Wed Feb 15 11:46:23 2012 @@ -192,23 +192,19 @@ string caption = _("Release Notes"); term relnoteslayout = nil; - term relnotesscreen = `VBox ( - `HBox( - `HWeight( 20, `Empty() ), - // combobox - `HWeight( 60, `VBox(`Left ( - `ReplacePoint ( - `id(`lang_rp), - `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) - ) - ), - `ReplacePoint(`id(`content_rp), - `RichText (`id (`relnotescontent), "") - ) - )), - `HWeight( 20,`Empty() ) - ) - ); + term relnotesscreen = `MarginBox ( 2.0, 0.2, + // combobox + `VBox(`Left ( + `ReplacePoint ( + `id(`lang_rp), + `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) + ) + ), + `ReplacePoint(`id(`content_rp), + `RichText (`id (`relnotescontent), "") + ) + ) + ); // if there are more products installed, show them in tabs or with // combo box, bnc #359137 (do not show tab for one product) @@ -268,7 +264,7 @@ boolean UsePlainText ( string file ) { boolean ret = UI::TextMode() && FileUtils::Exists(file); if (ret) - y2milestone("Found .txt file with release notes, will use it for TUI."); + y2milestone("Found .txt file \"%1\" with release notes, will use it for TUI.", file); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67429 - /tags/stable-2_22_0/iscsi-client/
by fehr＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: fehr Date: Wed Feb 15 11:37:44 2012 New Revision: 67429 URL: http://svn.opensuse.org/viewcvs/yast?rev=67429&view=rev Log: Created tag stable-2_22_0 for iscsi-client Added: tags/stable-2_22_0/iscsi-client/ - copied from r67428, trunk/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67428 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes
by fehr＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: fehr Date: Wed Feb 15 11:36:25 2012 New Revision: 67428 URL: http://svn.opensuse.org/viewcvs/yast?rev=67428&view=rev Log: version 2.22.0 Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=67428&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Feb 15 11:36:25 2012 @@ -1 +1 @@ -2.21.9 +2.22.0 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 15 11:36:25 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 15 11:36:05 CET 2012 - fehr(a)suse.de + +- version 2.22.0 + +------------------------------------------------------------------- Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de - change detection of qla iscsi devices (bnc#745201) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67427 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 20:46:03 2012 New Revision: 67427 URL: http://svn.opensuse.org/viewcvs/yast?rev=67427&view=rev Log: - fixed exit code check (missing from bnc #561876) Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 14 20:46:03 2012 @@ -489,7 +489,8 @@ ); integer ret = (integer)SCR::Execute (.target.bash, command); y2milestone ("Running command %1 with exit code %2", command, ret); - if (ret == 5){ + if (ret == 8) + { string popup = sformat (_("Device %1 is not formatted. Format device now? If you want to format multiple devices in parallel, press 'Cancel' and select 'Perform Action', 'Format' later on. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67426 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 20:44:53 2012 New Revision: 67426 URL: http://svn.opensuse.org/viewcvs/yast?rev=67426&view=rev Log: - use switch statement Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 14 20:44:53 2012 @@ -399,6 +399,7 @@ UI::CloseDialog (); } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -406,51 +407,72 @@ */ void ReportActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: No device found for <ccwid>."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not change state of the device."), id)); - else if (ret == 5) + break; + + case 5: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification _("%1: Device is not a DASD."), id)); - else if (ret == 6) + break; + + case 6: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not load module."), id)); - else if (ret == 7) - //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + break; + + case 7: + // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification _("%1: Failed to activate DASD."), id)); - else if (ret == 8) - //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + break; + + case 8: + // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification _("%1: DASD is not formatted."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Activate selected Disks * @param channel string Name of the disk to activate Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 14 20:44:53 2012 @@ -328,6 +328,7 @@ UI::CloseDialog(); } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -335,51 +336,74 @@ */ void ReportActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: No device found for <ccwid>."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: WWPN invalid."), id)); - else if (ret == 5) + break; + + case 5: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not activate WWPN for adapter %1."), id)); - else if (ret == 6) + break; + + case 6: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not activate ZFCP device."), id)); - else if (ret == 7) + break; + + case 7: Report::Error (sformat ( // error report, %1 is device identification _("%1: SCSI disk could not be deactivated."), id)); - else if (ret == 8) + break; + + case 8: Report::Error (sformat ( // error report, %1 is device identification _("%1: ZFCP LUN could not be unregistered."), id)); - else if (ret == 9) + break; + + case 9: Report::Error (sformat ( // error report, %1 is device identification _("%1: ZFCP WWPN could not be unregistered."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -387,39 +411,56 @@ */ void ReportControllerActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: Device <ccwid> does not exist."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: Module zfcp could not be loaded."), id)); - else if (ret == 5) + break; + + case 5: Report::Error (sformat ( // error report, %1 is device identification _("%1: Adapter status could not be changed."), id)); - else if (ret == 6) + break; + + case 6: Report::Error (sformat ( // error report, %1 is device identification _("%1: WWPN ports still active."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Activate a disk * @param channel string channel id -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67425 - in /trunk/s390/src: dasd/wizards.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 11:41:44 2012 New Revision: 67425 URL: http://svn.opensuse.org/viewcvs/yast?rev=67425&view=rev Log: - use correct CloseDialog function Modified: trunk/s390/src/dasd/wizards.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/dasd/dialogs.ycp"; + /** * Whole configuration of controller * @return symbol MainDASDSequence */ -symbol MainDASDSequence () { +symbol MainDASDSequence() +{ map aliases = $[ - "main" : ``(DASDDialog ()), - "add" : ``(AddDASDDiskDialog ()) + "main" : ``(DASDDialog()), + "add" : ``(AddDASDDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any DASDSequence() { - +any DASDSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainDASDSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any DASDAutoSequence() { - +any DASDAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainDASDSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/zfcp/dialogs.ycp"; + /** * Main dialog * @return symbol dialog */ -symbol MainZFCPSequence () { +symbol MainZFCPSequence() +{ map aliases = $[ - "main" : ``(ZFCPDialog ()), - "add" : ``(AddZFCPDiskDialog ()) + "main" : ``(ZFCPDialog()), + "add" : ``(AddZFCPDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any ZFCPSequence() { - +any ZFCPSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainZFCPSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any ZFCPAutoSequence() { - +any ZFCPAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainZFCPSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67424 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:19:00 2012 New Revision: 67424 URL: http://svn.opensuse.org/viewcvs/yast?rev=67424&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:19:00 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Mon Feb 13 18:19:00 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67423 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:18:46 2012 New Revision: 67423 URL: http://svn.opensuse.org/viewcvs/yast?rev=67423&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:18:46 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Mon Feb 13 18:18:46 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67422 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:18:31 2012 New Revision: 67422 URL: http://svn.opensuse.org/viewcvs/yast?rev=67422&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:18:31 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Mon Feb 13 18:18:31 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67421 - /tags/stable-2_22_1/ncurses/
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 14:06:07 2012 New Revision: 67421 URL: http://svn.opensuse.org/viewcvs/yast?rev=67421&view=rev Log: Created tag stable-2_22_1 for ncurses Added: tags/stable-2_22_1/ncurses/ - copied from r67420, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67420 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: coolo Date: Mon Feb 13 13:26:36 2012 New Revision: 67420 URL: http://svn.opensuse.org/viewcvs/yast?rev=67420&view=rev Log: update repo urls Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Feb 13 13:26:36 2012 @@ -200,9 +200,9 @@ <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/12.1/</baseurl> + <baseurl>http://download.opensuse.org/update/12.2/</baseurl> <alias>repo-update</alias> - <name>openSUSE-12.1-Update</name> + <name>openSUSE-12.2-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -211,36 +211,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/12.1/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.2/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-12.1-Oss</name> + <name>openSUSE-12.2-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/12.1/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.2/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-12.1-Non-Oss</name> + <name>openSUSE-12.2-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/12.1/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/12.2/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-12.1-Debug</name> + <name>openSUSE-12.2-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/update/12.1/</baseurl> + <baseurl>http://download.opensuse.org/debug/update/12.2/</baseurl> <alias>repo-debug-update</alias> - <name>openSUSE-12.1-Update-Debug</name> + <name>openSUSE-12.2-Update-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -248,9 +248,9 @@ </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/12.1/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/12.2/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-12.1-Source</name> + <name>openSUSE-12.2-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67419 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 13:15:43 2012 New Revision: 67419 URL: http://svn.opensuse.org/viewcvs/yast?rev=67419&view=rev Log: 2.22.1 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=67419&r1=674… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Mon Feb 13 13:15:43 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Feb 13 13:15:43 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 13 13:09:45 CET 2012 - gs(a)suse.de + +- NCRichText: interpret html tags inside <pre> </pre> + (bnc #724119, bnc #737752) +- V 2.22.1 + +------------------------------------------------------------------- Wed Dec 21 12:23:41 CET 2011 - gs(a)suse.de - Confirmed license -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67418 - in /trunk/ncurses/src: NCtext.cc NCurses.h
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 12:32:04 2012 New Revision: 67418 URL: http://svn.opensuse.org/viewcvs/yast?rev=67418&view=rev Log: remove \r from text, respect tabs for calculation of columns Modified: trunk/ncurses/src/NCtext.cc trunk/ncurses/src/NCurses.h Modified: trunk/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCtext.cc?rev=67418&… ============================================================================== --- trunk/ncurses/src/NCtext.cc (original) +++ trunk/ncurses/src/NCtext.cc Mon Feb 13 12:32:04 2012 @@ -46,6 +46,7 @@ #include <wchar.h> // wcwidth #include <langinfo.h> +#include <boost/algorithm/string.hpp> const NCstring NCtext::emptyStr; @@ -81,7 +82,7 @@ if ( ntext.str().empty() ) return; - const wstring & text( ntext.str() ); + wstring text( ntext.str() ); wstring::size_type spos = 0; @@ -89,6 +90,9 @@ bool sawnl = false; // saw new line + // handle DOS text + boost::erase_all( text, L"\r" ); + while (( cpos = text.find( L'\n', spos ) ) != wstring::npos ) { if ( sawnl ) @@ -119,8 +123,11 @@ if ( ntext.str().empty() ) return; - const wstring & text( ntext.str() ); + wstring text( ntext.str() ); + // handle DOS text + boost::erase_all( text, L"\r" ); + wstring::size_type spos = 0; wstring::size_type cpos = wstring::npos; @@ -194,7 +201,10 @@ for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) { - tmp_len += wcwidth( *wstr_it ); + if ( iswprint( *wstr_it ) ) + tmp_len += wcwidth( *wstr_it ); + else if ( *wstr_it == L'\t' ) + tmp_len += NCurses::tabsize(); } if ( tmp_len > llen ) Modified: trunk/ncurses/src/NCurses.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCurses.h?rev=67418&… ============================================================================== --- trunk/ncurses/src/NCurses.h (original) +++ trunk/ncurses/src/NCurses.h Mon Feb 13 12:32:04 2012 @@ -207,6 +207,8 @@ static int lines() { return ::LINES; } + static int tabsize() { return ::TABSIZE; } + void run(); public: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67417 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 12:09:37 2012 New Revision: 67417 URL: http://svn.opensuse.org/viewcvs/yast?rev=67417&view=rev Log: use boost::replace_all Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Mon Feb 13 12:09:37 2012 @@ -45,6 +45,7 @@ #include "stringutil.h" #include "stdutil.h" #include <sstream> +#include <boost/algorithm/string.hpp> #include "YMenuItem.h" #include "YApplication.h" @@ -420,6 +421,10 @@ } +// +// Calculate longest line of text in <pre> </pre> tags +// and adjust the pad accordingly +// void NCRichText::AdjustPrePad( const wchar_t *osch ) { const wchar_t * wch = osch; @@ -443,14 +448,10 @@ // resolve the entities to get correct length for calculation of longest line wtxt = filterEntities( wtxt ); - wstring to_repl = L" "; - size_t pos; - // replace by \n to get appropriate lines in NCtext - for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) - wtxt.replace( pos, to_repl.length(), L"\n" ); - - yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + boost::replace_all( wtxt, L" ", L"\n" ); + + yuiDebug() << "Text: " << wtxt << " initial length: " << wch - osch << endl; NCstring nctxt( wtxt ); NCtext ftext( nctxt ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67416 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 17:47:54 2012 New Revision: 67416 URL: http://svn.opensuse.org/viewcvs/yast?rev=67416&view=rev Log: - removed defines and double back ticks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 17:47:54 2012 @@ -440,7 +440,8 @@ * Run the dialog for adding DASDs * @return symbol from AddDASDDiskDialog */ -define symbol AddDASDDiskDialog () ``{ +symbol AddDASDDiskDialog () +{ if (! Mode::config ()) { y2error ("DASD Add Disk dialog shouldn't be run in Mode::config ()"); Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 17:47:54 2012 @@ -31,12 +31,12 @@ global map<string, boolean> diag = $[]; -global define void ActivateDisk (string channel, boolean diag); -global define void DeactivateDisk (string channel, boolean diag); -global define void ProbeDisks (); -global define void FormatDisks (list<string> disks_list, integer par, +global void ActivateDisk (string channel, boolean diag); +global void DeactivateDisk (string channel, boolean diag); +global void ProbeDisks (); +global void FormatDisks (list<string> disks_list, integer par, boolean write_vl, boolean interactive); -global define string GetPartitionInfo (string disk); +global string GetPartitionInfo (string disk); boolean disk_configured = false; @@ -71,7 +71,8 @@ * Abort function * @return blah blah lahjk */ -global define boolean Abort() ``{ +global boolean Abort() +{ if(AbortFunction != nil) return AbortFunction (); return false; @@ -297,43 +298,38 @@ return $[ "install":[], "remove":[] ]; } + /** * Check if DASD subsystem is available * @return boolean True if more than one disk */ -global define boolean IsAvailable () { - list<map<string,any> > disks = (list<map<string,any> >) - SCR::Read (.probe.disk); - - disks = filter (map<string,any> d, disks, ``( - tolower (d["device"]:"") == "dasd" - )); +global boolean IsAvailable() +{ + list<map<string, any> > disks = (list<map<string,any> >) SCR::Read(.probe.disk); + disks = filter (map<string,any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); integer count = size (disks); y2milestone ("Detected %1 DASD disks", count); - return (count > 0); + return count > 0; } /** * Probe for DASD disks */ -global define void ProbeDisks () { +global void ProbeDisks() +{ /* if (Mode::config ()) return; */ // popup label UI::OpenDialog (`Label (_("Reading Configured DASD Disks"))); - list<map<string,any> > disks = (list<map<string,any> >) - SCR::Read (.probe.disk); - - disks = filter (map<string,any> d, disks, ``( - tolower (d["device"]:"") == "dasd" - )); - - disks = maplist (map<string,any> d, disks, ``{ + list<map<string, any> > disks = (list<map<string, any> >) SCR::Read(.probe.disk); + disks = filter (map<string, any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); + + disks = maplist (map<string,any> d, disks, { string channel = d["sysfs_bus_id"]:"0.0.0000"; d["channel"] = channel; boolean active = d["resource", "io", 0, "active"]:false; @@ -362,7 +358,7 @@ return d; }); integer index = -1; - DASDController::devices = listmap (map<string,any> d, disks, ``{ + DASDController::devices = listmap (map<string,any> d, disks, { index = index + 1; return $[ index : d ]; }); @@ -408,7 +404,8 @@ * @param id integer chanel id of the device * @param ret integer exit code of the operation */ -define void ReportActivationError (any id, integer ret) { +void ReportActivationError(any id, integer ret) +{ if (ret != 0) { if (ret == 1) @@ -459,7 +456,8 @@ * @param channel string Name of the disk to activate * @param diag boolean Activate DIAG or not */ -global define void ActivateDisk (string channel, boolean diag) { +global void ActivateDisk(string channel, boolean diag) +{ // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", @@ -503,7 +501,8 @@ * @param channel string Name of the disk to deactivate * @param diag boolean Activate DIAG or not */ -global define void DeactivateDisk (string channel, boolean diag) { +global void DeactivateDisk(string channel, boolean diag) +{ // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", @@ -524,8 +523,8 @@ * @param write_vl boolean Write a Volume label * @param interactive boolean Interactive yes/no */ -global define void FormatDisks (list<string> disks_list, integer par, - boolean write_vl, boolean interactive) +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl, + boolean interactive) { if (par > size (disks_list)) par = size (disks_list); Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 17:47:54 2012 @@ -32,8 +32,8 @@ map<string,boolean> activated_controllers = $[]; -global define void ActivateDisk (string channel, string wwpn, string lun); -global define void ProbeDisks(); +global void ActivateDisk(string channel, string wwpn, string lun); +global void ProbeDisks(); boolean disk_configured = false; @@ -87,11 +87,13 @@ */ global boolean() AbortFunction = Modified; + /** * Abort function * @return blah blah lahjk */ -global define boolean Abort() ``{ +global boolean Abort() +{ if(AbortFunction != nil) return AbortFunction (); return false; @@ -274,7 +276,8 @@ * Get available zfcp controllers * @return list<map<string,any> > of availabel Controllers */ -global define list<map<string,any> > GetControllers () { +global list<map<string, any> > GetControllers() +{ if (controllers == nil) { controllers = (list<map<string,any> >)SCR::Read (.probe.storage); @@ -330,7 +333,8 @@ * @param id integer chanel id of the device * @param ret integer exit code of the operation */ -define void ReportActivationError (any id, integer ret) { +void ReportActivationError(any id, integer ret) +{ if (ret != 0) { if (ret == 1) @@ -381,7 +385,8 @@ * @param id integer chanel id of the device * @param ret integer exit code of the operation */ -define void ReportControllerActivationError (any id, integer ret) { +void ReportControllerActivationError(any id, integer ret) +{ if (ret != 0) { if (ret == 1) @@ -421,8 +426,8 @@ * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -global define void ActivateDisk (string channel, string wwpn, string lun) { - +global void ActivateDisk(string channel, string wwpn, string lun) +{ if (! activated_controllers[channel]:false) { string command = sformat ( @@ -462,7 +467,8 @@ * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -global define void DeactivateDisk (string channel, string wwpn, string lun) { +global void DeactivateDisk(string channel, string wwpn, string lun) +{ string command = sformat ( "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", channel, Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 17:47:54 2012 @@ -145,7 +145,8 @@ * Show the ZFCP-Dialog * @return symbol From the dialog */ -define symbol ZFCPDialog () ``{ +symbol ZFCPDialog() +{ DisplayZFCPDialog (); ReloadZFCPDialog (); @@ -216,7 +217,8 @@ * Add ZFCP-Dialog * @return symbol the dialog */ -define symbol AddZFCPDiskDialog () ``{ +symbol AddZFCPDiskDialog() +{ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_add"]:""; @@ -229,7 +231,7 @@ integer i_lun = tointeger (fcp_lun); integer new_lun = i_lun; - foreach (integer k, map<string,any> v, ZFCPController::devices, ``{ + foreach (integer k, map<string,any> v, ZFCPController::devices, { if (i_lun == tointeger (v["detail", "fcp_lun"]:"")) { if (v["vendor"]:"" == "IBM" && v["device"]:"" == "25f03") @@ -245,19 +247,15 @@ list<string>items = []; if (Mode::config ()) { - items = maplist (integer index, map<string,any> d, - ZFCPController::devices, - { + items = maplist (integer index, map<string, any> d, ZFCPController::devices, { return d["detail", "controller_id"]:""; }); items = toset (items); - items = filter (string i, items, ``(i != "" && i != nil)); + items = filter (string i, items, { return i != "" && i != nil; }); } else { - items = maplist (map<string,any> c, - ZFCPController::GetControllers (), - ``{ + items = maplist (map<string, any> c, ZFCPController::GetControllers(), { string channel = c["sysfs_bus_id"]:"0.0.0000"; return channel; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67415 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 17:30:40 2012 New Revision: 67415 URL: http://svn.opensuse.org/viewcvs/yast?rev=67415&view=rev Log: - replaced background by process agent Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 17:30:40 2012 @@ -533,7 +533,7 @@ map<integer,string> disks = $[]; list<string> disks_cmd = []; integer index = -1; - foreach (string device, disks_list, ``{ + foreach (string device, disks_list, { index = index + 1; disks[index] = device; disks_cmd = add(disks_cmd, sformat("-f '%1'", device)); @@ -551,52 +551,59 @@ index = 0; while (index < par) { - contents = add (contents, `ProgressBar (`id (index), " ", 100, 0)); + // progress bar + contents = add(contents, `ProgressBar(`id(index), sformat(_("Formatting %1:"), + disks[index]:""), 100, 0)); index = index + 1; } UI::OpenDialog (contents); map<integer,integer> cylinders = $[]; map<integer,integer> done = $[]; // start formatting on background - any ret = SCR::Execute (.background.run_output, command); - y2milestone ("Background start returned %1", ret); + integer process_id = (integer) SCR::Execute(.process.start_shell, command); + y2milestone ("Process start returned %1", process_id); // get the sizes of all disks index = 0; while (index < size (disks)) { y2milestone ("Running first formatting cycle"); sleep (500); - if (! (boolean)SCR::Read (.background.isrunning)) + + if (!(boolean) SCR::Read(.process.running, process_id)) { UI::CloseDialog (); - integer iret = (integer)SCR::Read (.background.status); + integer iret = (integer) SCR::Read(.process.status, process_id); // error report, %1 is exit code of the command (integer) Report::Error (sformat (_("Disks formatting failed. Exit code: %1."), iret)); return; } - list new_lines = (list) SCR::Read (.background.newout); - foreach (any line, new_lines, { - integer siz = tointeger (line); + + while (index < size (disks)) + { + string line = (string) SCR::Read(.process.read_line, process_id); + if (line == nil) + break; + + integer siz = tointeger (line); if (siz == 0) siz = 999999999; cylinders[index] = siz; index = index + 1; - }); + } } y2milestone ("Sizes of disks: %1", cylinders); y2milestone ("Disks to format: %1", disks); list<integer> last_step = []; string last_rest = ""; - while ((boolean)SCR::Read (.background.isrunning)) + while ((boolean) SCR::Read(.process.running, process_id)) { sleep (1000); - string buffer = sformat ("%1", - SCR::Read (.background.buffer_out)); + string buffer = (string) SCR::Read(.process.read, process_id); buffer = last_rest + buffer; list<string> progress = splitstring (buffer, "|"); map<integer,integer> this_step = $[]; - if ((boolean)SCR::Read (.background.isrunning)) + if ((boolean) SCR::Read(.process.running, process_id)) { integer last = size (progress) - 1; last_rest = progress[last]:""; @@ -629,7 +636,7 @@ index = 0; integer siz = size (this_step); foreach (integer k, integer v, this_step, { - UI::ChangeWidget (`id (index), `Label, sformat ( + UI::ChangeWidget(`id(index), `Label, sformat( // progress bar, %1 is device name, %2 and %3 // integers, // eg. Formatting /dev/dasda: cylinder 123 of 12334 done @@ -637,9 +644,8 @@ disks[k]:"", done[k]:0, cylinders[k]:0)); - UI::ChangeWidget (`id (index), `Value, - 100 * done[k]:0 / cylinders[k]:1); - UI::ChangeWidget (`id (index), `Enabled, true); + UI::ChangeWidget(`id(index), `Value, 100 * done[k]:0 / cylinders[k]:1); + UI::ChangeWidget(`id(index), `Enabled, true); index = index + 1; }); while (index < par) @@ -651,7 +657,7 @@ } } UI::CloseDialog (); - integer iret = (integer)SCR::Read (.background.status); + integer iret = (integer) SCR::Read(.process.status, process_id); if (iret != 0) { // error report, %1 is exit code of the command (integer) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67414 - /trunk/s390/src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 16:48:08 2012 New Revision: 67414 URL: http://svn.opensuse.org/viewcvs/yast?rev=67414&view=rev Log: - added comments for translators Modified: trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 16:48:08 2012 @@ -257,6 +257,7 @@ list<integer> selected = ListSelectedDASD(); if (isempty(selected)) { + // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; @@ -337,9 +338,10 @@ } else if (ret == `format) { - list<integer> selected = ListSelectedDASD (); + list<integer> selected = ListSelectedDASD(); if (isempty(selected)) { + // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67413 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 16:35:15 2012 New Revision: 67413 URL: http://svn.opensuse.org/viewcvs/yast?rev=67413&view=rev Log: - readded option -Y for dasdfmt (see bnc #446998) Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 16:35:15 2012 @@ -542,9 +542,8 @@ string additional_param = ""; if (! write_vl) additional_param = "--no-label"; - string command = sformat ( - "/sbin/dasdfmt -P %2 -b 4096 -y -m 1 %3 %1", disks_param, par, - additional_param); + string command = sformat("/sbin/dasdfmt -Y -P %2 -b 4096 -y -m 1 %3 %1", + disks_param, par, additional_param); y2milestone ("Running command %1", command); index = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67412 - in /trunk/s390: package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/DASDController.ycp src/modules/ZFCPController.ycp src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 15:02:29 2012 New Revision: 67412 URL: http://svn.opensuse.org/viewcvs/yast?rev=67412&view=rev Log: - use multiselection table in main dasd dialog - added quoting to program execution - changed initial filter_max to 0.0.ffff (recommended by Ihno) Modified: trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Fri Feb 10 15:02:29 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 10 14:59:45 CET 2012 - aschnell(a)suse.de + +- used multiselection table in main DASD dialog + +------------------------------------------------------------------- Wed Dec 7 10:04:50 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 15:02:29 2012 @@ -22,28 +22,18 @@ include "s390/dasd/helps.ycp"; -/** - * List DASD devices that are currently being selected - * @return list<integer> list of IDs of selected DASD devices - */ -define list<integer> ListSelectedDASD () ``{ - map<integer, boolean> sel_list = (map<integer, boolean>)filter ( - integer k, boolean v, DASDController::selected, - ``( - v == true - )); - list<integer> to_activate = maplist (integer k, boolean v, sel_list, ``(k)); - y2milestone ("Selected list: %1", to_activate); - return to_activate; -} - - -// -------------------------------------------------------------------------- - - + /** + * List DASD devices that are currently being selected + * @return list<integer> list of IDs of selected DASD devices + */ + list<integer> ListSelectedDASD() + { + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); + y2milestone("selected %1", selected); + return selected; + } -// now real dialogs /** * Read settings dialog @@ -92,10 +82,9 @@ { items = maplist(integer k, map<string, any> d, devices, { boolean active = d["resource", "io", 0, "active"]:false; - integer channel = d["resource", "io", 0, "start"]:0; - string str_channel = d["channel"]:""; + string channel = d["channel"]:""; string access = toupper(d["resource", "io", 0, "mode"]:"RO"); - string diag = String::YesNo(DASDController::diag[str_channel]:false); + string diag = String::YesNo(DASDController::diag[channel]:false); string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), @@ -107,11 +96,6 @@ string formatted = String::YesNo(d["formatted"]:false); string partition_info = d["partition_info"]:"--"; - string selected = DASDController::selected[k]:false - // table cell - ? _("Yes") - : "-"; - if (!active) { type = "--"; @@ -121,7 +105,7 @@ device = "--"; } - return `item(`id(k), selected, str_channel, device, type, access, diag, formatted, + return `item(`id(k), channel, device, type, access, diag, formatted, partition_info); }); } @@ -146,8 +130,6 @@ term header = `header( // table header - _("Sel."), - // table header `Right(_("Channel")), // table header _("Device"), @@ -201,7 +183,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt(`notify), header, []), + `Table(`id(`table), `opt(`multiSelection), header, []), Mode::config () ? `HBox ( // push button @@ -211,8 +193,6 @@ `HStretch () ) : `HBox ( - // pudh button - `PushButton (`id (`select), _("&Select or Deselect")), `HStretch (), // menu button `MenuButton (`id (`operation), _("Perform &Action"), actions) @@ -237,14 +217,17 @@ DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - DASDController::ProbeDisks (); + DASDController::ProbeDisks(); list<term> items = GetDASDDiskItems(); + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); UI::ChangeWidget(`id(`table), `Items, items); - UI::SetFocus (`table); + UI::ChangeWidget(`id(`table), `SelectedItems, selected); + UI::SetFocus(`table); } + /** * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer @@ -259,72 +242,53 @@ { ret = UI::UserInput(); - integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); - if (ret == `filter) { ReloadDASDDialog (); ret = nil; continue; } - else if (ret == `table || ret == `select) + else if (ret == `table) { - DASDController::selected[selected] - = ! DASDController::selected[selected]:false; - UI::ChangeWidget (`id (`table), `Item (selected, 0), - DASDController::selected[selected]:false - // table cell - ? _("Yes") - : "-"); ret = nil; - UI::SetFocus (`table); continue; } else if (ret == `activate) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ + + foreach (integer id, selected, { string channel = DASDController::devices[id,"channel"]:""; boolean diag = DASDController::diag[channel]:false; - DASDController::ActivateDisk ( - channel, - diag - ); + DASDController::ActivateDisk(channel, diag); }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; - } else if (ret == `deactivate) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ + + foreach (integer id, selected, { string channel = DASDController::devices[id,"channel"]:""; boolean diag = DASDController::diag[channel]:false; - DASDController::DeactivateDisk ( - channel, - diag - ); + DASDController::DeactivateDisk(channel, diag); }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; } else if (ret == `diag_on) @@ -347,8 +311,6 @@ }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; } else if (ret == `diag_off) @@ -371,26 +333,23 @@ }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; } else if (ret == `format) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD (); + if (isempty(selected)) { Popup::Message (_("No disk selected.")); ret = nil; continue; } + // check if disks are R/W and active string problem = ""; - foreach (integer id, to_activate, { - boolean active = (boolean) - (DASDController::devices[id, "resource", "io", 0, "active"]:false); - string access = toupper ( - (string)(DASDController::devices[id, "resource", "io", 0, "mode"]:"RO")); + foreach (integer id, selected, { + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; + string access = toupper(DASDController::devices[id, "resource", "io", 0, "mode"]:"RO"); if (! active) { // error report, %1 is device identification @@ -412,8 +371,8 @@ continue; } integer par = 8; - if (par > size (to_activate)) - par = size (to_activate); + if (par > size (selected)) + par = size (selected); boolean cancel = false; UI::OpenDialog (`VBox ( `IntField (`id (`par), @@ -428,9 +387,8 @@ ) )); ret = UI::UserInput (); - par = (integer)UI::QueryWidget (`id (`par), `Value); - boolean write_vl = (boolean) - UI::QueryWidget (`id (`write_label), `Value); + par = (integer) UI::QueryWidget(`id(`par), `Value); + boolean write_vl = (boolean) UI::QueryWidget(`id(`write_label), `Value); UI::CloseDialog (); if (ret == `cancel) { @@ -440,7 +398,7 @@ } // final confirmation before formatting the discs - list<string> channels = maplist (integer id, to_activate, { + list<string> channels = maplist (integer id, selected, { return DASDController::devices[id, "channel"]:""; }); string channels_str = mergestring (channels, ", "); @@ -464,7 +422,7 @@ } // final confirmation -- end - list<string> devices = maplist (integer id, to_activate, ``{ + list<string> devices = maplist (integer id, selected, { return DASDController::devices[id, "dev_name"]:""; }); DASDController::FormatDisks (devices, par, write_vl, true); @@ -548,7 +506,6 @@ } return (symbol) ret; - } } Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 15:02:29 2012 @@ -25,10 +25,8 @@ global map<integer,map<string,any> > devices = $[]; -global map<integer, boolean> selected = $[]; - global string filter_min = "0.0.0000"; - global string filter_max = "f.f.ffff"; + global string filter_max = "0.0.ffff"; global map<string, boolean> diag = $[]; @@ -343,7 +341,7 @@ { string device = d["dev_name"]:""; map scr_out = (map)SCR::Execute (.target.bash_output, sformat ( - "dasdview -x -f %1 | grep formatted", device)); + "dasdview -x -f '%1' | grep formatted", device)); boolean formatted = false; if (scr_out["exit"]:0 == 0) { @@ -464,7 +462,7 @@ global define void ActivateDisk (string channel, boolean diag) { // if (! Arch::s390_32 ()) diag = false; string command = sformat ( - "/sbin/dasd_configure %1 %2 %3", + "/sbin/dasd_configure '%1' '%2' '%3'", channel, 1, diag ? 1 : 0 @@ -479,7 +477,7 @@ if ((Mode::autoinst() && Popup::TimedOKCancel(popup, 10)) || Popup::ContinueCancel (popup)) { - string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", channel); + string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); @@ -508,7 +506,7 @@ global define void DeactivateDisk (string channel, boolean diag) { // if (! Arch::s390_32 ()) diag = false; string command = sformat ( - "/sbin/dasd_configure %1 %2 %3", + "/sbin/dasd_configure '%1' '%2' '%3'", channel, 0, diag ? 1 : 0 @@ -538,7 +536,7 @@ foreach (string device, disks_list, ``{ index = index + 1; disks[index] = device; - disks_cmd = add (disks_cmd, sformat ("-f %1", device)); + disks_cmd = add(disks_cmd, sformat("-f '%1'", device)); }); string disks_param = mergestring (disks_cmd, " "); string additional_param = ""; @@ -668,9 +666,9 @@ * @param disk string Disk to read info from * @return GetPartitionInfo string The info */ -global define string GetPartitionInfo (string disk) { - map outmap = (map)SCR::Execute (.target.bash_output, sformat ( - "/sbin/fdasd -p %1", disk)); +global string GetPartitionInfo (string disk) +{ + map outmap = (map) SCR::Execute (.target.bash_output, sformat("/sbin/fdasd -p '%1'", disk)); // if not an eckd-disk it's an fba-disk. fba-disks have only one partition if (outmap["exit"]:0 != 0) Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 15:02:29 2012 @@ -13,7 +13,6 @@ module "ZFCPController"; textdomain "s390"; -import "Arch"; import "Mode"; import "Progress"; import "Report"; @@ -23,10 +22,8 @@ global map<integer,map<string,any> > devices = $[]; -global map<integer, boolean> selected = $[]; - global string filter_min = "0.0.0000"; - global string filter_max = "f.f.ffff"; + global string filter_max = "0.0.ffff"; global map<string, any> previous_settings = $[]; @@ -429,7 +426,7 @@ if (! activated_controllers[channel]:false) { string command = sformat ( - "/sbin/zfcp_host_configure %1 %2", + "/sbin/zfcp_host_configure '%1' '%2'", channel, 1 ); Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 15:02:29 2012 @@ -9,7 +9,6 @@ { textdomain "s390"; -import "Arch"; import "Label"; import "Mode"; import "Popup"; @@ -43,7 +42,6 @@ return ret ? `next : `abort; } - // ------------------------------------------------------------------------------------ /** * Get the list of items for the table of ZFCP devices @@ -64,10 +62,6 @@ string fcp_lun = d["detail", "fcp_lun"]:"unknown"; if (fcp_lun != "unknown") fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); - string selected = ZFCPController::selected[k]:false - // table cell - ? _("Yes") - : "-"; return `item(`id(k), channel, wwpn, fcp_lun); }); @@ -84,13 +78,13 @@ ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - ZFCPController::ProbeDisks (); + ZFCPController::ProbeDisks(); list<term> items = GetZFCPDiskItems(); UI::ChangeWidget(`id(`table), `Items, items); - UI::ChangeWidget (`id (`delete), `Enabled, size (items) > 0); - UI::SetFocus (`table); + UI::ChangeWidget(`id(`delete), `Enabled, !isempty(items)); + UI::SetFocus(`table); } /** @@ -371,7 +365,6 @@ } return (symbol) ret; - } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67411 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:57:16 2012 New Revision: 67411 URL: http://svn.opensuse.org/viewcvs/yast?rev=67411&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:57:16 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Fri Feb 10 14:57:16 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67410 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:57:05 2012 New Revision: 67410 URL: http://svn.opensuse.org/viewcvs/yast?rev=67410&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:57:05 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Fri Feb 10 14:57:05 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67409 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:56:54 2012 New Revision: 67409 URL: http://svn.opensuse.org/viewcvs/yast?rev=67409&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:56:54 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Fri Feb 10 14:56:54 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67408 - in /trunk/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:51 2012 New Revision: 67408 URL: http://svn.opensuse.org/viewcvs/yast?rev=67408&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.err trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServerHelperFunctions.ycp trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:51 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: trunk/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServerHelperFu… ============================================================================== --- trunk/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ trunk/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:51 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone… ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:51 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== (empty) Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== --- trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:51 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== --- trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:51 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67407 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:40 2012 New Revision: 67407 URL: http://svn.opensuse.org/viewcvs/yast?rev=67407&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:40 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:40 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:40 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:40 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:40 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67406 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:24 2012 New Revision: 67406 URL: http://svn.opensuse.org/viewcvs/yast?rev=67406&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:24 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:24 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:24 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:24 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67405 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 12:15:08 2012 New Revision: 67405 URL: http://svn.opensuse.org/viewcvs/yast?rev=67405&view=rev Log: - use new String::YesNo Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 12:15:08 2012 @@ -18,6 +18,7 @@ import "Report"; import "Sequencer"; import "Wizard"; + import "String"; include "s390/dasd/helps.ycp"; @@ -82,17 +83,9 @@ { items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; - string diag = d["diag"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - string format = d["format"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - return `item (`id(k), channel, format, diag); + string diag = String::YesNo(d["diag"]:false); + string format = String::YesNo(d["format"]:false); + return `item(`id(k), channel, format, diag); }); } else @@ -102,11 +95,7 @@ integer channel = d["resource", "io", 0, "start"]:0; string str_channel = d["channel"]:""; string access = toupper(d["resource", "io", 0, "mode"]:"RO"); - string diag = DASDController::diag[str_channel]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string diag = String::YesNo(DASDController::diag[str_channel]:false); string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), @@ -115,11 +104,7 @@ substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = d["formatted"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string formatted = String::YesNo(d["formatted"]:false); string partition_info = d["partition_info"]:"--"; string selected = DASDController::selected[k]:false Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "DASDController"; textdomain "s390"; @@ -283,9 +281,7 @@ // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No s = sformat (_("Channel ID: %1, Format: %2, Use DIAG: %3"), - d["channel"]:"", - d["format"]:false ? _("Yes") : _("No"), - d["diag"]:false ? _("Yes") : _("No") + d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false) ); return s; }); @@ -695,5 +691,4 @@ return mergestring (l, ", "); } -/* EOF */ } Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "ZFCPController"; textdomain "s390"; @@ -503,7 +501,4 @@ return runCommand(sformat("zfcp_san_disc -b '%1' -p '%2' -L", busid, wwpn)); } - - -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67404 - /trunk/yast2/library/types/src/String.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 12:12:06 2012 New Revision: 67404 URL: http://svn.opensuse.org/viewcvs/yast?rev=67404&view=rev Log: - added String::YesNo Modified: trunk/yast2/library/types/src/String.ycp Modified: trunk/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/String.y… ============================================================================== --- trunk/yast2/library/types/src/String.ycp (original) +++ trunk/yast2/library/types/src/String.ycp Fri Feb 10 12:12:06 2012 @@ -75,6 +75,26 @@ return NonEmpty (splitstring (s, "\n")); } + +/** + * @param value boolean + * @return boolean value as "Yes" or "No" + */ +global string YesNo(boolean value) +{ + if (value) + { + // human text for Boolean value + return _("Yes"); + } + else + { + // human text for Boolean value + return _("No"); + } +} + + /** * Return a pretty description of a byte count * -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67403 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:45:05 2012 New Revision: 67403 URL: http://svn.opensuse.org/viewcvs/yast?rev=67403&view=rev Log: - replaced FourDigitHex by tohexstring - removed unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:45:05 2012 @@ -98,36 +98,24 @@ else { items = maplist(integer k, map<string, any> d, devices, { - boolean active = (boolean)(d["resource", "io", 0, "active"]:false); - integer channel = (integer)(d["resource", "io", 0, "start"]:0); - string str_channel = (string)(d["channel"]:""); - string access = toupper ((string)(d["resource", "io", 0, "mode"]:"RO")); + boolean active = d["resource", "io", 0, "active"]:false; + integer channel = d["resource", "io", 0, "start"]:0; + string str_channel = d["channel"]:""; + string access = toupper(d["resource", "io", 0, "mode"]:"RO"); string diag = DASDController::diag[str_channel]:false // table cell ? _("Yes") // table cell : _("No"); string device = d["dev_name"]:""; - string type = toupper (sformat ("%1/%2, %3/%4", - substring ( - DASDController::FourDigitHex ( - d["device_id"]:0 & tointeger ("0xffff") - ), - 2), - substring ( - DASDController::FourDigitHex (d["detail", "cu_model"]:0), - 4), - substring ( - DASDController::FourDigitHex ( - d["sub_device_id"]:0 & tointeger ("0xffff") - ), - 2), - substring ( - DASDController::FourDigitHex (d["detail", "dev_model"]:0), - 4) + string type = toupper(sformat("%1/%2, %3/%4", + substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), + substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), + substring(tohexstring(d["sub_device_id"]:0 & 0xffff, 4), 2), + substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = (boolean)d["formatted"]:false + string formatted = d["formatted"]:false // table cell ? _("Yes") // table cell Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 11:45:05 2012 @@ -323,26 +323,6 @@ /** - * Translate integer number to its hexadecimal representation with leading - * 0x and exactliy 4 hexadecimal numbers - * @param i integer integer number - * @return string hexadecimal number - */ -global define string FourDigitHex(integer i) ``{ - string s = tohexstring(i); - string zeros = ""; - - integer l = 6 - size(s); - - while (l > 0) { - zeros = zeros + "0"; - l = l - 1; - } - - return substring(s, 0, 2) + zeros + substring(s, 2); -} - -/** * Probe for DASD disks */ global define void ProbeDisks () { Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:45:05 2012 @@ -58,7 +58,7 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string dev_name = (string)(d["dev_name"]:""); + string dev_name = d["dev_name"]:""; string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; string fcp_lun = d["detail", "fcp_lun"]:"unknown"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67402 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:35:10 2012 New Revision: 67402 URL: http://svn.opensuse.org/viewcvs/yast?rev=67402&view=rev Log: - removed some unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -80,7 +80,7 @@ if (Mode::config ()) { - items = (list<term>) maplist (integer k, map<string,any> d, devices, { + items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; string diag = d["diag"]:false // table cell @@ -92,12 +92,12 @@ ? _("Yes") // table cell : _("No"); - return `item (`id (k), channel, format, diag); + return `item (`id(k), channel, format, diag); }); - return items; } - - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + else + { + items = maplist(integer k, map<string, any> d, devices, { boolean active = (boolean)(d["resource", "io", 0, "active"]:false); integer channel = (integer)(d["resource", "io", 0, "start"]:0); string str_channel = (string)(d["channel"]:""); @@ -133,14 +133,14 @@ // table cell : _("No"); string partition_info = d["partition_info"]:"--"; - boolean activate = d["activate"]:false; string selected = DASDController::selected[k]:false // table cell ? _("Yes") : "-"; - if (!active) { + if (!active) + { type = "--"; access = "--"; formatted = "--"; @@ -148,13 +148,11 @@ device = "--"; } - term t = `item (`id (k), selected, str_channel, device, - type ,access); - t = add (t, diag); - t = add (t, formatted); - t = add (t, partition_info); - return t; + return `item(`id(k), selected, str_channel, device, type, access, diag, formatted, + partition_info); }); + } + return items; } Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -57,7 +57,7 @@ list<term> items = []; - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + items = maplist(integer k, map<string, any> d, devices, { string dev_name = (string)(d["dev_name"]:""); string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; @@ -69,9 +69,9 @@ ? _("Yes") : "-"; - term t = `item (`id (k), channel, wwpn, fcp_lun); - return t; + return `item(`id(k), channel, wwpn, fcp_lun); }); + return items; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67401 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:25:17 2012 New Revision: 67401 URL: http://svn.opensuse.org/viewcvs/yast?rev=67401&view=rev Log: - code simplifications Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -163,8 +161,8 @@ /** * Draw the DASD dialog */ -define void DisplayDASDDialog() { - +void DisplayDASDDialog() +{ string help_key = Mode::config () ? "disk_selection_config" : "disk_selection"; @@ -176,7 +174,7 @@ string caption = _("DASD Disk Management"); term header = `header( - // table header + // table header _("Sel."), // table header `Right(_("Channel")), @@ -187,11 +185,12 @@ // table header _("Access Type"), // table header - _("Use DIAG")); - // table header - header = add (header, _("Formatted")); - // table header - header = add (header, _("Partition Information")); + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); if (Mode::config ()) { @@ -207,17 +206,16 @@ list actions = [ // menu button id - `item (`id (`activate), _("&Activate")), + `item(`id(`activate), _("&Activate")), + // menu button id + `item(`id(`deactivate), _("&Deactivate")), + // menu button id + `item(`id(`diag_on), _("Set DIAG O&n")), + // menu button id + `item(`id(`diag_off), _("Set DIAG O&ff")), // menu button id - `item (`id(`deactivate), _("&Deactivate")), + `item(`id(`format), _("&Format")) ]; - // menu button id - actions = add (actions, `item (`id(`diag_on), _("Set DIAG O&n"))); - // menu button id - actions = add (actions, `item (`id(`diag_off), _("Set DIAG O&ff"))); - - // menu button id - actions = add (actions, `item (`id(`format), _("&Format"))); /* Dialog content */ term content = `VBox( @@ -232,7 +230,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt (`notify), header, []), + `Table(`id(`table), `opt(`notify), header, []), Mode::config () ? `HBox ( // push button @@ -582,7 +580,4 @@ } - -// EOF } - Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -98,14 +96,23 @@ /** * Show the ZFCP-Dialog */ -define void DisplayZFCPDialog () { - +void DisplayZFCPDialog() +{ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ string caption = _("Configured ZFCP Devices"); + term header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + /* Dialog content */ term content = `VBox( `HBox( @@ -120,18 +127,7 @@ ) ), `HBox( - `Table( - `id(`table), `opt(`keepSorting, `notify), - `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("zfcp-LUN")) - ), - [] - ) + `Table(`id(`table), `opt(`notify), header, []) ), `HBox( `PushButton(`id(`add), Label::AddButton ()), @@ -378,7 +374,4 @@ } - -// EOF } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67400 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:05:53 2012 New Revision: 67400 URL: http://svn.opensuse.org/viewcvs/yast?rev=67400&view=rev Log: - improved device filtering and moved to modules Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Fri Feb 10 11:05:53 2012 @@ -74,43 +74,12 @@ * @param max_chan integer maximal channel number * @return a list of terms for the table */ -define list<term> GetDASDDiskItems(string min_channel, string max_channel) ``{ - integer id = 0; +list<term> GetDASDDiskItems() +{ + map<integer, map<string, any> > devices = DASDController::GetFilteredDevices(); list<term> items = []; - integer min_css = tointeger(substring (min_channel, 0, 1)); - integer min_lcss = tointeger(sformat("0x%1",substring (min_channel, 2, 1))); - integer min_chan = tointeger(sformat("0x%1",substring (min_channel, 4, 4))); - - integer max_css = tointeger(substring (max_channel, 0, 1)); - integer max_lcss = tointeger(sformat("0x%1",substring (max_channel, 2, 1))); - integer max_chan = tointeger(sformat("0x%1",substring (max_channel, 4, 4))); - - map<integer,map<string,any> > devices = DASDController::devices; - - if (min_chan > 0 || min_lcss > 0 || min_css > 0 || - max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) - { - y2milestone ("Filter disks: %1.%2.%3 to %4.%5.%6", - min_css, min_lcss, min_chan, - max_css, max_lcss, max_chan); - - devices = (map<integer,map<string,any> >)filter ( - integer k, map<string,any> d, devices, - ``{ - string channel = d["channel"]:"0.0.0000"; - integer tmp_css = tointeger(substring (channel, 0, 1)); - integer tmp_lcss = tointeger(sformat("0x%1",substring (channel, 2, 1))); - integer tmp_chan = tointeger(sformat("0x%1",substring (channel, 4, 4))); - - return (tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan - && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan); - }); - } - - y2milestone ("Current disks: %1", devices); - if (Mode::config ()) { items = (list<term>) maplist (integer k, map<string,any> d, devices, { @@ -254,9 +223,9 @@ term content = `VBox( `HBox( // text entry - `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), "0.0.0000"), + `InputField(`id(`min_chan), `opt(`hstretch), _("Mi&nimum Channel"), DASDController::filter_min), // text entry - `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), "0.f.ffff"), + `InputField(`id(`max_chan), `opt(`hstretch), _("Ma&ximum Channel"), DASDController::filter_max), `VBox ( `Label (""), // push button @@ -285,23 +254,23 @@ Wizard::SetContents(caption, content, help, true, true); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); + + UI::ChangeWidget(`id(`min_chan), `ValidChars, "0123456789abcdefABCDEF."); + UI::ChangeWidget(`id(`max_chan), `ValidChars, "0123456789abcdefABCDEF."); } /** * Redraw the contents of the widgets in the DASD Dialog */ -define void ReloadDASDDialog () ``{ - DASDController::filter_min = (string) - UI::QueryWidget(`min_chan, `Value); - DASDController::filter_max = (string) - UI::QueryWidget(`max_chan, `Value); +void ReloadDASDDialog() +{ + DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); + DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); DASDController::ProbeDisks (); - list<term> items = GetDASDDiskItems ( - DASDController::filter_min, - DASDController::filter_max); + list<term> items = GetDASDDiskItems(); UI::ChangeWidget(`id(`table), `Items, items); UI::SetFocus (`table); Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Fri Feb 10 11:05:53 2012 @@ -29,9 +29,8 @@ global map<integer, boolean> selected = $[]; -global string filter_min = "0.0.0000"; - -global string filter_max = "f.f.ffff"; + global string filter_min = "0.0.0000"; + global string filter_max = "f.f.ffff"; global map<string, boolean> diag = $[]; @@ -230,6 +229,49 @@ } + global map<integer, map<string, any> > + GetDevices() + { + return devices; + } + + + global map<integer, map<string, any> > + GetFilteredDevices() + { + list<string> min_strs = splitstring(filter_min, "."); + integer min_css = tointeger("0x" + min_strs[0]:"0"); + integer min_lcss = tointeger("0x" + min_strs[1]:"0"); + integer min_chan = tointeger("0x" + min_strs[2]:"0"); + + list<string> max_strs = splitstring(filter_max, "."); + integer max_css = tointeger("0x" + max_strs[0]:"0"); + integer max_lcss = tointeger("0x" + max_strs[1]:"0"); + integer max_chan = tointeger("0x" + max_strs[2]:"0"); + + map<integer, map<string, any> > ret = GetDevices(); + + if (min_chan > 0 || min_lcss > 0 || min_css > 0 || + max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) + { + y2milestone("filter devices: %1.%2.%3 to %4.%5.%6", min_css, min_lcss, min_chan, + max_css, max_lcss, max_chan); + + ret = filter(integer k, map<string, any> d, ret, { + list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + + return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && + tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; + }); + } + + return ret; + } + + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Fri Feb 10 11:05:53 2012 @@ -27,9 +27,8 @@ global map<integer, boolean> selected = $[]; -global string filter_min = "0.0.0000"; - -global string filter_max = "0.f.ffff"; + global string filter_min = "0.0.0000"; + global string filter_max = "f.f.ffff"; global map<string, any> previous_settings = $[]; @@ -201,6 +200,50 @@ ]; } + + global map<integer, map<string, any> > + GetDevices() + { + return devices; + } + + + global map<integer, map<string, any> > + GetFilteredDevices() + { + list<string> min_strs = splitstring(filter_min, "."); + integer min_css = tointeger("0x" + min_strs[0]:"0"); + integer min_lcss = tointeger("0x" + min_strs[1]:"0"); + integer min_chan = tointeger("0x" + min_strs[2]:"0"); + + list<string> max_strs = splitstring(filter_max, "."); + integer max_css = tointeger("0x" + max_strs[0]:"0"); + integer max_lcss = tointeger("0x" + max_strs[1]:"0"); + integer max_chan = tointeger("0x" + max_strs[2]:"0"); + + map<integer, map<string, any> > ret = GetDevices(); + + if (min_chan > 0 || min_lcss > 0 || min_css > 0 || + max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) + { + y2milestone("filter devices: %1.%2.%3 to %4.%5.%6", min_css, min_lcss, min_chan, + max_css, max_lcss, max_chan); + + ret = filter(integer k, map<string, any> d, ret, { + list<string> tmp_strs = splitstring(d["channel"]:"0.0.0000", "."); + integer tmp_css = tointeger("0x" + tmp_strs[0]:"0"); + integer tmp_lcss = tointeger("0x" + tmp_strs[1]:"0"); + integer tmp_chan = tointeger("0x" + tmp_strs[2]:"0"); + + return tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan && + tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan; + }); + } + + return ret; + } + + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:05:53 2012 @@ -53,38 +53,11 @@ * @param max_chan integer maximal channel number * @return a list of terms for the table */ -define list<term> GetZFCPDiskItems(string min_channel, string max_channel) ``{ - integer id = 0; - list<term> items = []; - - map<integer,map<string,any> > devices = ZFCPController::devices; +list<term> GetZFCPDiskItems() +{ + map<integer, map<string, any> > devices = ZFCPController::GetFilteredDevices(); - integer min_css = tointeger(substring (min_channel, 0, 1)); - integer min_lcss = tointeger(sformat("0x%1",substring (min_channel, 2, 1))); - integer min_chan = tointeger(sformat("0x%1",substring (min_channel, 4, 4))); - - integer max_css = tointeger(substring (max_channel, 0, 1)); - integer max_lcss = tointeger(sformat("0x%1",substring (max_channel, 2, 1))); - integer max_chan = tointeger(sformat("0x%1",substring (max_channel, 4, 4))); - - - if (min_chan > 0 || min_lcss > 0 || min_css > 0 || - max_chan < 0xffff || max_lcss < 0xf || max_css < 0xf) - { - devices = (map<integer,map<string,any> >)filter ( - integer k, map<string,any> d, devices, - ``{ - string channel = d["detail", "controller_id"]:"0.0.0000"; - integer tmp_css = tointeger(substring (channel, 0, 1)); - integer tmp_lcss = tointeger(sformat("0x%1",substring (channel, 2, 1))); - integer tmp_chan = tointeger(sformat("0x%1",substring (channel, 4, 4))); - - - boolean ret = (tmp_css >= min_css && tmp_lcss >= min_lcss && tmp_chan >= min_chan - && tmp_css <= max_css && tmp_lcss <= max_lcss && tmp_chan <= max_chan); - return ret; - }); - } + list<term> items = []; items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ string dev_name = (string)(d["dev_name"]:""); @@ -104,16 +77,18 @@ return items; } + /** * Restart the ZFCP-Dialog */ -define void ReloadZFCPDialog () ``{ +void ReloadZFCPDialog() +{ ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); ZFCPController::ProbeDisks (); - list<term> items = GetZFCPDiskItems (ZFCPController::filter_min, ZFCPController::filter_max); + list<term> items = GetZFCPDiskItems(); UI::ChangeWidget(`id(`table), `Items, items); UI::ChangeWidget (`id (`delete), `Enabled, size (items) > 0); @@ -170,8 +145,12 @@ Wizard::SetContentsButtons(caption, content, help, Label::BackButton(), Label::NextButton()); Wizard::HideBackButton(); Wizard::SetAbortButton(`abort, Label::CancelButton() ); + + UI::ChangeWidget(`id(`min_chan), `ValidChars, "0123456789abcdefABCDEF."); + UI::ChangeWidget(`id(`max_chan), `ValidChars, "0123456789abcdefABCDEF."); } + /** * Show the ZFCP-Dialog * @return symbol From the dialog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67399 - in /trunk/dns-server: package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 15:24:21 2012 New Revision: 67399 URL: http://svn.opensuse.org/viewcvs/yast?rev=67399&view=rev Log: - Fixed transforming records from relative to absolute format. The final dot is added only to records including a zone name (bnc#745560). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Thu Feb 9 15:24:21 2012 @@ -1,3 +1,10 @@ +------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + ------------------------------------------------------------------- Wed Nov 16 11:55:12 CET 2011 - jsuchome(a)suse.cz Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone… ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Thu Feb 9 15:24:21 2012 @@ -1561,6 +1561,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1601,11 +1616,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67398 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 15:22:51 2012 New Revision: 67398 URL: http://svn.opensuse.org/viewcvs/yast?rev=67398&view=rev Log: - Fixed transforming records from relative to absolute format. The final dot is added only to records including a zone name (bnc#745560). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Thu Feb 9 15:22:51 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + +------------------------------------------------------------------ Mon Jun 20 15:35:29 CEST 2011 - locilka(a)suse.cz - Automatically changing entered forwarder to a localhost IP if Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Thu Feb 9 15:22:51 2012 @@ -1560,6 +1560,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1600,11 +1615,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67397 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/dialog-masterzone.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 15:22:36 2012 New Revision: 67397 URL: http://svn.opensuse.org/viewcvs/yast?rev=67397&view=rev Log: - Fixed transforming records from relative to absolute format. The final dot is added only to records including a zone name (bnc#745560). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Thu Feb 9 15:22:36 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from relative to absolute format. + The final dot is added only to records including a zone name + (bnc#745560). + +------------------------------------------------------------------ Fri Jul 1 14:42:45 CEST 2011 - locilka(a)suse.cz - Fixed a typo (BNC #703099) Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Thu Feb 9 15:22:36 2012 @@ -1561,6 +1561,21 @@ return false; } +// Transform a given key/value by adding the ending dot if +// it ends with the current zone name +string TransformRecord (string record) { + string zone_regexp = mergestring ( + splitstring (current_zone["zone"]:"", "."), + "\\." + ); + + // key terminated with zone name without dot + if (regexpmatch (record, ".*\\." + zone_regexp + "$")) + record = record + "."; + + return record; +} + boolean CheckAndModifyRecord (string & type, string & key, string & val) { // (SYNTAX) Checking the record by record-type (true or false) if (CheckNewZoneRecordSyntax ($[ "key" : key, "type" : type, "val" : val ]) != true) { @@ -1601,11 +1616,15 @@ y2milestone("MX Priority decrased to maximal 65535 from %1", prio); } } - } else if (contains (["ns", "mx", "cname"], tolower_type)) { - if (regexpmatch (val, "\\..*[^.]$")) - val = val + "."; - } else if (regexpmatch (key, "\\..*[^.]$")) { - key = key + "."; + } + + if (tolower_type == "cname") { + key = TransformRecord (key); + val = TransformRecord (val); + } else if (contains (["ns", "mx"], tolower_type)) { + val = TransformRecord (val); + } else if (tolower_type == "a") { + key = TransformRecord (key); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67396 - /tags/stable-2_22_1/profile-manager/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 14:35:54 2012 New Revision: 67396 URL: http://svn.opensuse.org/viewcvs/yast?rev=67396&view=rev Log: Created tag stable-2_22_1 for profile-manager Added: tags/stable-2_22_1/profile-manager/ - copied from r67395, trunk/profile-manager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67395 - in /trunk/profile-manager: VERSION package/yast2-profile-manager.changes yast2-profile-manager.spec.in
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 14:35:20 2012 New Revision: 67395 URL: http://svn.opensuse.org/viewcvs/yast?rev=67395&view=rev Log: - add libtool as buildrequire - 2.22.1 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/yast2-profile-manager.spec.in Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=6739… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Thu Feb 9 14:35:20 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Thu Feb 9 14:35:20 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 9 14:22:36 CET 2012 - jsuchome(a)suse.cz + +- add libtool as buildrequire +- 2.22.1 + +------------------------------------------------------------------- Thu Feb 9 08:27:44 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/profile-manager/yast2-profile-manager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/yast2-profile-ma… ============================================================================== --- trunk/profile-manager/yast2-profile-manager.spec.in (original) +++ trunk/profile-manager/yast2-profile-manager.spec.in Thu Feb 9 14:35:20 2012 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL-2.0 -BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files +BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files libtool # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 Requires: yast2-users -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67394 - in /trunk/ncurses/src: NCAskForFile.cc NCFileSelection.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 14:31:53 2012 New Revision: 67394 URL: http://svn.opensuse.org/viewcvs/yast?rev=67394&view=rev Log: set initial file name Modified: trunk/ncurses/src/NCAskForFile.cc trunk/ncurses/src/NCFileSelection.cc Modified: trunk/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForFile.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCAskForFile.cc (original) +++ trunk/ncurses/src/NCAskForFile.cc Thu Feb 9 14:31:53 2012 @@ -238,6 +238,10 @@ dirName->addItem( dirList->getCurrentDir(), true ); // selected + if ( iniFileName == "" ) + // show the currently selected file + fileName->setValue( fileList->getCurrentFile() ); + // event loop do { Modified: trunk/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCFileSelection.cc?r… ============================================================================== --- trunk/ncurses/src/NCFileSelection.cc (original) +++ trunk/ncurses/src/NCFileSelection.cc Thu Feb 9 14:31:53 2012 @@ -409,6 +409,7 @@ const string & filter, const string & iniDir ) : NCFileSelection( parent, tableHeader, type, iniDir ) + , currentFile("") { //fillHeader(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67393 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/dialog-main.ycp
by locilka＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: locilka Date: Thu Feb 9 13:45:12 2012 New Revision: 67393 URL: http://svn.opensuse.org/viewcvs/yast?rev=67393&view=rev Log: Backporting from SP2 to SP1 - Automatically changing entered forwarder to a localhost IP if the server would forward to itself (non-local IP) (BNC #676676). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Thu Feb 9 13:45:12 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Mon Jun 20 15:35:29 CEST 2011 - locilka(a)suse.cz + +- Automatically changing entered forwarder to a localhost IP if + the server would forward to itself (non-local IP) (BNC #676676). + +------------------------------------------------------------------ Wed Mar 16 15:51:40 CET 2011 - locilka(a)suse.cz - Handling unknown error in LDAP initialization (BNC #679960). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-main.ycp Thu Feb 9 13:45:12 2012 @@ -428,6 +428,66 @@ } /** + * Returns list of IPs currently used by the system. + * + * @param boolean whether local addresses should be returned as well (the default is false) + */ +list <string> CurrentlyUsedIPs (boolean including_local) { + string cmd = "ip addr show | grep 'inet\$6\$\\?' | sed 's/^[ \\t]\\+inet\$6\$\\?[ \\t]\\+\$[^\\/]\\+\$\\/.*$/\\2/'"; + map cmd_ret = (map) SCR::Execute (.target.bash_output, cmd); + + if (cmd_ret == nil || cmd_ret["exit"]:-1 != 0) { + y2error ("Cannot get list of used IPs: %1", cmd_ret); + return nil; + } + + list <string> used_ips = splitstring (cmd_ret["stdout"]:"", "\n"); + used_ips = filter (string used_ip, used_ips, ``(used_ip != nil && used_ip != "")); + + // Filtering out all local IPs + if (including_local != true) { + used_ips = filter (string used_ip, used_ips, ``( + !regexpmatch(used_ip, "127\.0\.0\..*") && used_ip != "::1" + )); + } + + return used_ips; +} + +/** + * Gets an IP address and returns it's local equivalent: 127.0.0.1 for IPv4, ::1 for IPv6. + * If a given string is neither IPv4 nor IPv6, nil is returned. + * + * @param string IP to transform + * @returns string transformed IP + */ +string ChangeIPToLocalEquivalent (string ip_address) { + string ret = nil; + + if (IP::Check4 (ip_address)) { + ret = "127.0.0.1"; + } else if (IP::Check6 (ip_address)) { + ret = "::1"; + } else { + ret = nil; + } + + y2warning ("Transforming forwarder IP %1 to %2", ip_address, ret); + + if (ret == nil) { + // An error message, %1 is replaced with a variable IP + Report::Error (sformat(_("Cannot find local equivalent for IP %1"), ret)); + } else { + // TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP + Report::Warning (sformat(_("Forwarding DNS queries to itself would create an infinite loop. +IP address %1 is currently used by this server, so it has +been changed to its local equivalent %2."), ip_address, ret)); + } + + return ret; +} + +/** * Handle events in a tab of a dialog */ symbol HandleExpertForwardersPage (string key, map event) { @@ -449,6 +509,13 @@ ); return nil; } + + list <string> used_ips = CurrentlyUsedIPs (false); + if (contains (used_ips, new_addr)) { + new_addr = ChangeIPToLocalEquivalent (new_addr); + if (new_addr == nil) return nil; + } + if (contains (forwarders, new_addr)) { // error report -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67392 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 13:29:36 2012 New Revision: 67392 URL: http://svn.opensuse.org/viewcvs/yast?rev=67392&view=rev Log: restore <tt> - is used in Release Notes Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 9 13:29:36 2012 @@ -905,7 +905,7 @@ else if ( value == L"li" ) token = T_LI; else if ( value == L"ol" ) { token = T_LEVEL; leveltag = 1; } else if ( value == L"qt" ) token = T_IGNORE; - else if ( value == L"tt" ) token = T_IGNORE; + else if ( value == L"tt" ) token = T_TT; else if ( value == L"ul" ) { token = T_LEVEL; leveltag = 0; } break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67391 - /tags/stable-2_22_3/installation/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 10:55:50 2012 New Revision: 67391 URL: http://svn.opensuse.org/viewcvs/yast?rev=67391&view=rev Log: Created tag stable-2_22_3 for installation Added: tags/stable-2_22_3/installation/ - copied from r67390, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67390 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 10:55:25 2012 New Revision: 67390 URL: http://svn.opensuse.org/viewcvs/yast?rev=67390&view=rev Log: - adapt the style only for ssh installation, not vnc (bnc#742777) - 2.22.3 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=67390&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Feb 9 10:55:25 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Feb 9 10:55:25 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 9 10:53:01 CET 2012 - jsuchome(a)suse.cz + +- adapt the style only for ssh installation, not vnc (bnc#742777) +- 2.22.3 + +------------------------------------------------------------------- Tue Feb 7 17:22:46 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc #742777: ssh installation needs to much bandwidth Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Thu Feb 9 10:55:25 2012 @@ -156,7 +156,6 @@ # prepare VNC installation # --- # - export Y2STYLE="installation_slim" #============================================= # Setup splash screen #--------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67389 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 10:24:42 2012 New Revision: 67389 URL: http://svn.opensuse.org/viewcvs/yast?rev=67389&view=rev Log: call AdjustPrePad correctly (skip tag) Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 9 10:24:42 2012 @@ -1046,12 +1046,12 @@ if ( !endtag ) { preTag = true; // display text preserving newlines and spaces - AdjustPrePad( sch ); + AdjustPrePad( ech ); } else { preTag = false; - PadNL(); // add new line after pre + PadNL(); // add new line (text may continue after </pre>) } break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67388 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: gs Date: Thu Feb 9 09:59:03 2012 New Revision: 67388 URL: http://svn.opensuse.org/viewcvs/yast?rev=67388&view=rev Log: add new line after </pre> Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 9 09:59:03 2012 @@ -1051,6 +1051,7 @@ else { preTag = false; + PadNL(); // add new line after pre } break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67387 - /tags/stable-2_22_0/profile-manager/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 08:28:53 2012 New Revision: 67387 URL: http://svn.opensuse.org/viewcvs/yast?rev=67387&view=rev Log: Created tag stable-2_22_0 for profile-manager Added: tags/stable-2_22_0/profile-manager/ - copied from r67386, trunk/profile-manager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67386 - in /trunk/profile-manager: ./ package/ src/
by jsuchome＠svn2.opensuse.org 09 Feb '12

09 Feb '12

Author: jsuchome Date: Thu Feb 9 08:28:30 2012 New Revision: 67386 URL: http://svn.opensuse.org/viewcvs/yast?rev=67386&view=rev Log: - confirmed license - 2.22.0 Modified: trunk/profile-manager/VERSION trunk/profile-manager/package/yast2-profile-manager.changes trunk/profile-manager/src/ProfileManager.ycp trunk/profile-manager/src/complex.ycp trunk/profile-manager/src/dialogs.ycp trunk/profile-manager/src/helps.ycp trunk/profile-manager/src/profile-manager.ycp trunk/profile-manager/src/profile_manager.ycp trunk/profile-manager/src/wizards.ycp trunk/profile-manager/yast2-profile-manager.spec.in Modified: trunk/profile-manager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/VERSION?rev=6738… ============================================================================== --- trunk/profile-manager/VERSION (original) +++ trunk/profile-manager/VERSION Thu Feb 9 08:28:30 2012 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/profile-manager/package/yast2-profile-manager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/package/yast2-pr… ============================================================================== --- trunk/profile-manager/package/yast2-profile-manager.changes (original) +++ trunk/profile-manager/package/yast2-profile-manager.changes Thu Feb 9 08:28:30 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 9 08:27:44 CET 2012 - jsuchome(a)suse.cz + +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Tue Sep 27 10:30:21 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/profile-manager/src/ProfileManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/ProfileManag… ============================================================================== --- trunk/profile-manager/src/ProfileManager.ycp (original) +++ trunk/profile-manager/src/ProfileManager.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/ProfileManager.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/complex.ycp?… ============================================================================== --- trunk/profile-manager/src/complex.ycp (original) +++ trunk/profile-manager/src/complex.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/complex.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/dialogs.ycp?… ============================================================================== --- trunk/profile-manager/src/dialogs.ycp (original) +++ trunk/profile-manager/src/dialogs.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/dialogs.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/helps.ycp?re… ============================================================================== --- trunk/profile-manager/src/helps.ycp (original) +++ trunk/profile-manager/src/helps.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/helps.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/profile-manager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/profile-mana… ============================================================================== --- trunk/profile-manager/src/profile-manager.ycp (original) +++ trunk/profile-manager/src/profile-manager.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/profile-manager.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/src/profile_manager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/profile_mana… ============================================================================== --- trunk/profile-manager/src/profile_manager.ycp (original) +++ trunk/profile-manager/src/profile_manager.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Author: Martin Vidner <mvidner(a)suse.cz> * Summary: Just a redirection Modified: trunk/profile-manager/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/src/wizards.ycp?… ============================================================================== --- trunk/profile-manager/src/wizards.ycp (original) +++ trunk/profile-manager/src/wizards.ycp Thu Feb 9 08:28:30 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: include/profile-manager/wizards.ycp * Package: Configuration of profile-manager Modified: trunk/profile-manager/yast2-profile-manager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/profile-manager/yast2-profile-ma… ============================================================================== --- trunk/profile-manager/yast2-profile-manager.spec.in (original) +++ trunk/profile-manager/yast2-profile-manager.spec.in Thu Feb 9 08:28:30 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: gcc-c++ libxcrypt-devel scpm-devel doxygen perl-XML-Writer yast2-devtools yast2-core-devel yast2-users yast2-testsuite update-desktop-files # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67385 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQLogView.cc src/YQLogView.h
by tgoettlicher＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: tgoettlicher Date: Wed Feb 8 14:54:36 2012 New Revision: 67385 URL: http://svn.opensuse.org/viewcvs/yast?rev=67385&view=rev Log: Fixed bnc#731540: fixed auto-scroll in LogView (2.22.2) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQLogView.cc trunk/qt/src/YQLogView.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67385&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Wed Feb 8 14:54:36 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Wed Feb 8 14:54:36 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 8 14:54:15 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc#731540: fixed auto-scroll in LogView +- Version: 2.22.2 + +------------------------------------------------------------------- Tue Dec 20 16:30:28 CET 2011 - tgoettlicher(a)suse.de - Confirmed license Modified: trunk/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.cc?rev=67385&r1… ============================================================================== --- trunk/qt/src/YQLogView.cc (original) +++ trunk/qt/src/YQLogView.cc Wed Feb 8 14:54:36 2012 @@ -73,7 +73,7 @@ YUI_CHECK_NEW( _caption ); layout->addWidget( _caption ); - _qt_text = new QTextEdit( this ); + _qt_text = new MyTextEdit( this ); YUI_CHECK_NEW( _qt_text ); layout->addWidget( _qt_text ); @@ -82,6 +82,9 @@ _qt_text->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); _caption->setBuddy( _qt_text ); + + connect (_qt_text, SIGNAL(resized()), this, SLOT(slotResize())); + } @@ -119,6 +122,7 @@ { _qt_text->moveCursor( QTextCursor::End ); _qt_text->ensureCursorVisible(); + sb->setValue( sb->maximum() ); } _lastText = newString; @@ -163,6 +167,20 @@ return max( 80, hintHeight ); } +void +YQLogView::slotResize() +{ + QScrollBar *sb = _qt_text->verticalScrollBar(); + + bool atEnd = sb->value() == sb->maximum(); + + if (atEnd) + { + _qt_text->moveCursor( QTextCursor::End ); + _qt_text->ensureCursorVisible(); + sb->setValue( sb->maximum() ); + } +} void YQLogView::setSize( int newWidth, int newHeight ) Modified: trunk/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.h?rev=67385&r1=… ============================================================================== --- trunk/qt/src/YQLogView.h (original) +++ trunk/qt/src/YQLogView.h Wed Feb 8 14:54:36 2012 @@ -49,6 +49,8 @@ #include "YLogView.h" class YQWidgetCaption; +class MyTextEdit; + class YQLogView : public QFrame, public YLogView @@ -127,8 +129,32 @@ protected: YQWidgetCaption * _caption; - QTextEdit * _qt_text; + MyTextEdit * _qt_text; QString _lastText; + +private slots: + void slotResize(); + +}; + + +// We need a resize event in order to set the cursor to the last line +// for the auto-scroll feature +class MyTextEdit : public QTextEdit +{ + Q_OBJECT + public: + MyTextEdit( QWidget* parent ) : QTextEdit (parent) {} + + protected: + void resizeEvent ( QResizeEvent * event ) + { emit resized(); + QTextEdit::resizeEvent(event); + } + + signals: + void resized(); + }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67384 - /trunk/ycp-ui-bindings/examples/RichText4.ycp
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 14:34:21 2012 New Revision: 67384 URL: http://svn.opensuse.org/viewcvs/yast?rev=67384&view=rev Log: example for RichText (common tags) Added: trunk/ycp-ui-bindings/examples/RichText4.ycp Added: trunk/ycp-ui-bindings/examples/RichText4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText4.ycp (added) +++ trunk/ycp-ui-bindings/examples/RichText4.ycp Wed Feb 8 14:34:21 2012 @@ -0,0 +1,22 @@ +// Example for a RichText widget +{ + UI::OpenDialog( `opt(`defaultsize), + `VBox( + `RichText( "<h3>RichText example</h3>" + + "This is a RichText widget." + + "It's very much like HTML, but not quite as powerful." + + "bold and italic you can rely on." + + "-i-: keep the installed version and never update or delete it ( package locked )" + + " i : All requirements of this pattern/language are satisfied" + + "The product name is automatically replaced by the UI. " + + "Use the special macro &product; for that." + + "" + + "The current product name is &product;." + + "" + ), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67383 - /trunk/ycp-ui-bindings/examples/RichText5.ycp
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 14:31:12 2012 New Revision: 67383 URL: http://svn.opensuse.org/viewcvs/yast?rev=67383&view=rev Log: additional test for text in <pre> Added: trunk/ycp-ui-bindings/examples/RichText5.ycp Added: trunk/ycp-ui-bindings/examples/RichText5.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText5.ycp (added) +++ trunk/ycp-ui-bindings/examples/RichText5.ycp Wed Feb 8 14:31:12 2012 @@ -0,0 +1,12 @@ +// Example for a RichText widget +{ + UI::OpenDialog( `opt(`defaultsize), + `VBox( + `RichText( "<pre>\--- /.snapshots/4/snapshot/var/lib/zypp/RequestedLocales\t2011-12-08 17:09:23.312007703 +0800 +++ /.snapshots/5/snapshot/var/lib/zypp/RequestedLocales\t2011-12-08 18:39:35.461081330 +0800 @@ -1,4 +1,4 @@ -# zypp::RequestedLocales generated Thu 08 Dec 2011 05:09:23 PM WST +# zypp::RequestedLocales generated Do 08 Dez 2011 18:39:35 WST # -de_DE +en_US # </pre>" + ), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67382 - /trunk/ycp-ui-bindings/examples/RichText3.ycp
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 14:30:20 2012 New Revision: 67382 URL: http://svn.opensuse.org/viewcvs/yast?rev=67382&view=rev Log: correct text regarding new impl. of <pre> Modified: trunk/ycp-ui-bindings/examples/RichText3.ycp Modified: trunk/ycp-ui-bindings/examples/RichText3.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText3.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText3.ycp Wed Feb 8 14:30:20 2012 @@ -7,24 +7,26 @@ + "It's very much like HTML, but not quite as powerful." + "Text in pre tags preserves newlines and spaces." + "<pre>" - + " host ip adress host ip adress\n" - + " sturm 10.10.0.159 sturm 10.10.0.159\n\n" - + "Lines are not wrapped; in text mode HTML tags are not removed if the pre tag is used, " - + "but entities like product: &product; are filtered and shown correctly.\n" + + "Table in pre\n" + + " host\tip adress info description\n" + + " sturm\t10.10.0.159 old work station\n\n" + + "Lines are not wrapped but HTML tags are interpreted" + + " and entities like product: &product; are filtered and shown correctly." + "</pre>" + "After /pre the text is HTML text like before." + "Much much more text .............. continous" + " much much more text .... follows " + " much much more text ................." + "<pre>another pre t t </pre>" - + "and more text after pre is closed, now HTML text " + + "and more text after pre is closed, now HTML text,\n" + + "newlines are removed." + "" - + "<pre>Another text in pre preserving spaces and newlines\n" + + "<pre>Another text in pre preserving spaces and newlines\n" + " host ip adress host ip adress\n" + " sturm 10.10.0.159 sturm 10.10.0.159\n" - + "Lines are not wrapped; in text mode HTML tags are not removed if the pre tag is used.\n" + + "Lines are not wrapped; in newest version HTML tags are interpreted \tif the pre tag is used.\n" + "</pre>" - + "And after closing pre tag much more text - long long long long long lines are now wrapped again, this is a very very very very long long long long long long line Even longer and longer" + + "And after closing pre tag much more text - long long long long long lines are now wrapped again, this is a very very very very long long long long long long line Even longer and longer, line is wrapped again" + "<pre>And another short pre</pre>" ), `PushButton(`opt(`default), "&OK") -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67381 - /trunk/nfs-client/yast2-nfs-client.spec.in
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:39:34 2012 New Revision: 67381 URL: http://svn.opensuse.org/viewcvs/yast?rev=67381&view=rev Log: Formated spec file for obs. Modified: trunk/nfs-client/yast2-nfs-client.spec.in Modified: trunk/nfs-client/yast2-nfs-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/yast2-nfs-client.spec… ============================================================================== --- trunk/nfs-client/yast2-nfs-client.spec.in (original) +++ trunk/nfs-client/yast2-nfs-client.spec.in Wed Feb 8 13:39:34 2012 @@ -1,26 +1,26 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST +Group: System/YaST License: GPL-2.0+ -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite #ag_showexports moved to yast2 base #Wizard::SetDesktopTitleAndIcon -Requires: yast2 >= 2.21.22 +Requires: yast2 >= 2.21.22 #idmapd_conf agent -Requires: yast2-nfs-common +Requires: yast2-nfs-common # showmount, #150382, #286300 -Recommends: nfs-client +Recommends: nfs-client -Provides: yast2-config-nfs yast2-config-nfs-devel -Obsoletes: yast2-config-nfs yast2-config-nfs-devel -Provides: yast2-trans-nfs -Obsoletes: yast2-trans-nfs -Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_nfs_client.ycp +Provides: yast2-config-nfs yast2-config-nfs-devel +Obsoletes: yast2-config-nfs yast2-config-nfs-devel +Provides: yast2-trans-nfs +Obsoletes: yast2-trans-nfs +Provides: yast2-config-network:/usr/lib/YaST2/clients/lan_nfs_client.ycp -BuildArchitectures: noarch +BuildArch: noarch -Summary: YaST2 - NFS Configuration +Summary: YaST2 - NFS Configuration %description The YaST2 component for configuration of NFS. NFS stands for network @@ -50,3 +50,5 @@ @desktopdir@/nfs.desktop %doc @docdir@ @schemadir@/autoyast/rnc/nfs.rnc + +%changelog -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67380 - /trunk/ncurses/src/NCRichText.h
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 13:27:40 2012 New Revision: 67380 URL: http://svn.opensuse.org/viewcvs/yast?rev=67380&view=rev Log: add AdjustPrePad Modified: trunk/ncurses/src/NCRichText.h Modified: trunk/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.h?rev=673… ============================================================================== --- trunk/ncurses/src/NCRichText.h (original) +++ trunk/ncurses/src/NCRichText.h Wed Feb 8 13:27:40 2012 @@ -212,6 +212,7 @@ void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); void PadPreTXT( const wchar_t * sch, const unsigned len ); + void AdjustPrePad( const wchar_t * sch ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67379 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: gs Date: Wed Feb 8 13:26:38 2012 New Revision: 67379 URL: http://svn.opensuse.org/viewcvs/yast?rev=67379&view=rev Log: improve adjusting of pad size or text in <pre> tags Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Wed Feb 8 13:26:38 2012 @@ -347,22 +347,13 @@ void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); - + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - int len = textWidth( wtxt ); - - if ( cc + len > textwidth ) - { - textwidth = cc + len; - AdjustPad( wsze(cl + ftext.Lines(), textwidth) ); - yuiDebug() << "Adjust: " << cl+ftext.Lines() << " " << textwidth << endl; - } - // insert the text const wchar_t * sch = wtxt.data(); @@ -370,9 +361,6 @@ { myPad()->addwstr( sch, 1 ); // add one wide chararacter - if ( iswprint( *sch ) ) - cc += wcwidth( *sch ); // wcwidth for \t returns -1 - ++sch; } } @@ -432,7 +420,74 @@ } +void NCRichText::AdjustPrePad( const wchar_t *osch ) +{ + const wchar_t * wch = osch; + wstring wstr( wch, 6 ); + + size_t llen = 0; // longest line + size_t tmp_len = 0; // width of current line + + list<NCstring>::const_iterator line; // iterator for list <NCstring> mtext + std::wstring::const_iterator wstr_it; // iterator for wstring + + do + { + ++wch; + wstr.assign( wch, 6 ); + } + while ( *wch && wstr != L"</pre>" ); + + wstring wtxt( osch, wch - osch ); + + // resolve the entities to get correct length for calculation of longest line + wtxt = filterEntities( wtxt ); + + wstring to_repl = L" "; + size_t pos; + + // replace by \n to get appropriate lines in NCtext + for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) + wtxt.replace( pos, to_repl.length(), L"\n" ); + + yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + + NCstring nctxt( wtxt ); + NCtext ftext( nctxt ); + + // iterate through NCtext + for ( line = ftext.Text().begin(); line != ftext.Text().end(); ++line ) + { + tmp_len = 0; + + for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) + { + // skip html tags + if ( *wstr_it == '<' ) + { + wstr_it = find(wstr_it, (*line).str().end(), L'>'); + } + else if ( *wstr_it == '\t' ) + { + tmp_len += myPad()->tabsize(); + } + else + { + tmp_len += wcwidth( *wstr_it ); + } + } + + if ( tmp_len > llen ) + llen = tmp_len; + } + if ( llen > textwidth ) + { + textwidth = llen; + AdjustPad( wsze( cl + ftext.Lines(), llen ) ); // adjust pad to longest line + } + +} void NCRichText::DrawHTMLPad() { @@ -470,20 +525,15 @@ { switch ( *wch ) { - case L' ': // add white space + case L' ': // add white space + case L'\t': myPad()->addwstr( wch, 1 ); - cc+=wcwidth( *wch ); break; case L'\n': PadNL(); // add new line break; - case L'\t': // add tab - myPad()->addwstr( wch, 1 ); - cc += myPad()->tabsize(); - break; - default: yuiDebug() << "Ignoring " << *wch << endl; } @@ -996,11 +1046,11 @@ if ( !endtag ) { preTag = true; // display text preserving newlines and spaces + AdjustPrePad( sch ); } else { preTag = false; - PadNL(); // add new line after pre } break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67378 - /tags/stable-2_21_3/nfs-client/
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:11:04 2012 New Revision: 67378 URL: http://svn.opensuse.org/viewcvs/yast?rev=67378&view=rev Log: Created tag stable-2_21_3 for nfs-client Added: tags/stable-2_21_3/nfs-client/ (props changed) - copied from r67377, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67377 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/ui.ycp
by mfilka＠svn2.opensuse.org 08 Feb '12

08 Feb '12

Author: mfilka Date: Wed Feb 8 13:03:57 2012 New Revision: 67377 URL: http://svn.opensuse.org/viewcvs/yast?rev=67377&view=rev Log: Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67377&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Wed Feb 8 13:03:57 2012 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Wed Feb 8 13:03:57 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 8 12:00:10 UTC 2012 - mfilka(a)suse.com + +- Base server hostname combobox on existing values - bnc#547983 + +------------------------------------------------------------------- Wed Dec 7 10:05:12 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67377&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Wed Feb 8 13:03:57 2012 @@ -58,6 +58,11 @@ list<string> hosts = nil; /** + * List of already defined nfs mount points + */ + list< map <string,any> > nfs_entries = Nfs::nfs_entries; + + /** * Let the user choose one of a list of items * @param title selectionbox title * @param items a list of items @@ -178,6 +183,7 @@ `Bottom (button) ); } + /** * Ask user for an entry. * @param fstab_ent $["spec": "file": "mntops":] or nil @@ -213,6 +219,21 @@ servers = [ proposed_server ]; } + // append already defined servers - bug #547983 + foreach( map nfs_entry, nfs_entries, + { + term couple = SpecToServPath( nfs_entry[ "spec"]:""); + string known_server = ""; + + known_server = couple[0]:""; + + if( !contains( servers, known_server)) + servers = add( servers, known_server); + }); + + servers = sort( servers); + // + UI::OpenDialog( `opt(`decorated), `HBox( @@ -232,7 +253,8 @@ ), `HSpacing(0.5), TextAndButton ( - `TextEntry(`id(`pathent), + `InputField( `id(`pathent), + `opt(`hstretch), // textentry label _("&Remote Directory"), pth), // pushbutton label, @@ -245,7 +267,8 @@ `Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)), `Left( TextAndButton ( - `TextEntry(`id(`mountent), + `InputField(`id(`mountent), + `opt(`hstretch), // textentry label _("&Mount Point (local)"), mount), // button label @@ -256,7 +279,7 @@ ), // textentry label `VSpacing(0.2), - `TextEntry(`id(`optionsent), _("O&ptions"), options), + `InputField(`id(`optionsent), `opt( `hstretch), _("O&ptions"), options), `VSpacing(0.2), `ButtonBox( `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), @@ -468,7 +491,6 @@ ]; map<string,any> fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings); - list< map <string,any> > nfs_entries = Nfs::nfs_entries; map <string, any> modify_line = $[]; // Help, part 1 of 3 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67376 - /tags/stable-2_22_2/installation/
by tgoettlicher＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: tgoettlicher Date: Tue Feb 7 17:27:01 2012 New Revision: 67376 URL: http://svn.opensuse.org/viewcvs/yast?rev=67376&view=rev Log: Created tag stable-2_22_2 for installation Added: tags/stable-2_22_2/installation/ - copied from r67375, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67375 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call startup/YaST2.ssh
by tgoettlicher＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: tgoettlicher Date: Tue Feb 7 17:25:24 2012 New Revision: 67375 URL: http://svn.opensuse.org/viewcvs/yast?rev=67375&view=rev Log: - Fixed bnc #742777: ssh installation needs to much bandwidth - 2.22.2 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=67375&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Feb 7 17:25:24 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 7 17:25:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 7 17:22:46 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc #742777: ssh installation needs to much bandwidth +- 2.22.2 + +------------------------------------------------------------------- Fri Jan 13 11:02:40 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Tue Feb 7 17:25:24 2012 @@ -147,6 +147,7 @@ # --- # : + export Y2STYLE="installation_slim" } #----[ prepare_for_vnc ]----# @@ -155,6 +156,7 @@ # prepare VNC installation # --- # + export Y2STYLE="installation_slim" #============================================= # Setup splash screen #--------------------------------------------- Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Tue Feb 7 17:25:24 2012 @@ -59,6 +59,8 @@ #---------------------------------------- if [ -f /var/lib/YaST2/runme_at_boot ];then + export Y2STYLE="installation_slim" + # running the second stage installation /usr/lib/YaST2/startup/YaST2.call installation continue -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67374 - /tags/branch-Code-11-SP2-2_17_14/http-server/
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 16:08:02 2012 New Revision: 67374 URL: http://svn.opensuse.org/viewcvs/yast?rev=67374&view=rev Log: Created tag branch-Code-11-SP2-2_17_14 for http-server Added: tags/branch-Code-11-SP2-2_17_14/http-server/ (props changed) - copied from r67373, branches/SuSE-Code-11-SP2-Branch/http-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67373 - in /branches/SuSE-Code-11-SP1-Branch/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm src/http-server.desktop
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 11:55:37 2012 New Revision: 67373 URL: http://svn.opensuse.org/viewcvs/yast?rev=67373&view=rev Log: Getting SP1 into the same state as SP2 - not wanted to maintain more than one version in SLE 11 - Especially fixed bug with NameVirtualHost (bnc#486475) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/VERSION Tue Feb 7 11:55:37 2012 @@ -1 +1 @@ -2.17.11 +2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes Tue Feb 7 11:55:37 2012 @@ -1,7 +1,20 @@ ------------------------------------------------------------------- +Tue Feb 7 11:45:02 UTC 2012 - locilka(a)suse.cz + +- Backported a real fix for NameVirtualHost from trunk (bnc#486475) +- 2.17.14 + +------------------------------------------------------------------- +Thu Dec 22 09:39:32 UTC 2011 - jsrain(a)suse.cz + +- removed superfluous spaces from .desktop-file (bnc#712052) +- 2.17.13 + +------------------------------------------------------------------- Fri Feb 25 13:53:54 CET 2011 - jsrain(a)suse.cz - fixed server flags handling (bnc#656589) +- 2.17.12 ------------------------------------------------------------------- Wed Mar 25 14:06:28 CET 2009 - mzugec(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb 7 11:55:37 2012 @@ -538,6 +538,7 @@ # $vhost_files->{$ip} = @newdata; # } + $self->validateNVH(); } @@ -588,29 +589,28 @@ # push(@newdata, $row); # } # } -my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); - $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } + my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); } $vhost_files->{main}{DATA} = \@tmp_data; - - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Tue Feb 7 11:55:37 2012 @@ -16,7 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=http-server X-SuSE-YaST-AutoInstClonable=true -X-SuSE-YaST-AutoInstSchema = http-server.rnc +X-SuSE-YaST-AutoInstSchema=http-server.rnc Icon=yast-http-server Exec=/sbin/yast2 http-server -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67372 - in /branches/SuSE-Code-11-SP2-Branch/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 11:53:41 2012 New Revision: 67372 URL: http://svn.opensuse.org/viewcvs/yast?rev=67372&view=rev Log: - Backported a real fix for NameVirtualHost from trunk (bnc#486475) - 2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/http-server/VERSION branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm Modified: branches/SuSE-Code-11-SP2-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/VERSION Tue Feb 7 11:53:41 2012 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes Tue Feb 7 11:53:41 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 7 11:45:02 UTC 2012 - locilka(a)suse.cz + +- Backported a real fix for NameVirtualHost from trunk (bnc#486475) +- 2.17.14 + +------------------------------------------------------------------- Thu Dec 22 09:39:32 UTC 2011 - jsrain(a)suse.cz - removed superfluous spaces from .desktop-file (bnc#712052) Modified: branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb 7 11:53:41 2012 @@ -538,6 +538,7 @@ # $vhost_files->{$ip} = @newdata; # } + $self->validateNVH(); } @@ -588,29 +589,28 @@ # push(@newdata, $row); # } # } -my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); - $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } + my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); } $vhost_files->{main}{DATA} = \@tmp_data; - - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67371 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:35:49 2012 New Revision: 67371 URL: http://svn.opensuse.org/viewcvs/yast?rev=67371&view=rev Log: change detection of qla iscsi devices (bnc#745201) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Mon Feb 6 14:35:49 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de + +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de - call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Mon Feb 6 14:35:49 2012 @@ -651,7 +651,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -698,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules":maplist( list ml, tmp, ``(ml[0]:"")), + map r = $["modules":maplist( list ml, tmp, ``(ml[0]:"")), "iface":c["dev_name"]:"", - "macaddr":c["resource","hwaddr",0,"addr"]:""]); + "macaddr":c["resource","hwaddr",0,"addr"]:""]; + y2milestone( "GetOffloadItems cinf:%1", r ); + return( r ); }); - y2milestone( "GetOffloadItems hw_mods:%1", hw_mods ); integer idx = 0; foreach( list<any> l, offload, ``{ @@ -714,8 +715,12 @@ foreach( map hw, hw_mods, ``{ if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -729,7 +734,8 @@ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); - y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", + SCR::Execute (.target.bash_output, offboard_script + " " + l[0]:"" )); offload_res[l[0]:""] = $[]; offload_res[l[0]:"","exit"] = out["exit"]:1; list<string> sl = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67370 - /tags/branch-Code-11-SP2-2_17_34/iscsi-client/
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:07:20 2012 New Revision: 67370 URL: http://svn.opensuse.org/viewcvs/yast?rev=67370&view=rev Log: Created tag branch-Code-11-SP2-2_17_34 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_34/iscsi-client/ (props changed) - copied from r67369, branches/SuSE-Code-11-SP2-Branch/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67369 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:07:11 2012 New Revision: 67369 URL: http://svn.opensuse.org/viewcvs/yast?rev=67369&view=rev Log: - 2.17.34 - change detection of qla iscsi devices (bnc#745201) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Mon Feb 6 14:07:11 2012 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Mon Feb 6 14:07:11 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de + +- 2.17.34 +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de - 2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Mon Feb 6 14:07:11 2012 @@ -651,7 +651,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -698,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules": [ c["driver_module"]:"" ], + map r = $["modules": [ c["driver_module"]:"" ], "iface":c["dev_name"]:"", - "macaddr":c["resource","hwaddr",0,"addr"]:""]); + "macaddr":c["resource","hwaddr",0,"addr"]:""]; + y2milestone( "GetOffloadItems cinf:%1", r ); + return( r ); }); - y2milestone( "GetOffloadItems hw_mods:%1", hw_mods ); integer idx = 0; foreach( list<any> l, offload, ``{ @@ -715,8 +716,12 @@ ``{ //if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) if( size(mod)+size(hw["modules"]:[])>size(union(mod,hw["modules"]:[]))) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -730,7 +735,8 @@ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); - y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", + SCR::Execute (.target.bash_output, offboard_script + " " + l[0]:"" )); offload_res[l[0]:""] = $[]; offload_res[l[0]:"","exit"] = out["exit"]:1; list<string> sl = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67368 - /tags/branch-Code-11-SP2-2_17_14/kerberos-client/
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:16:14 2012 New Revision: 67368 URL: http://svn.opensuse.org/viewcvs/yast?rev=67368&view=rev Log: Created tag branch-Code-11-SP2-2_17_14 for kerberos-client Added: tags/branch-Code-11-SP2-2_17_14/kerberos-client/ (props changed) - copied from r67367, branches/SuSE-Code-11-SP2-Branch/kerberos-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67367 - in /branches/SuSE-Code-11-SP2-Branch/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:15:38 2012 New Revision: 67367 URL: http://svn.opensuse.org/viewcvs/yast?rev=67367&view=rev Log: - removed previous workaround (bnc#743355 fixed properly) - 2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/kerbe… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION Mon Feb 6 12:15:38 2012 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/kerbe… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes Mon Feb 6 12:15:38 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 08:37:24 CET 2012 - jsuchome(a)suse.cz + +- removed previous workaround (bnc#743355 fixed properly) +- 2.17.14 + +------------------------------------------------------------------- Thu Jan 26 15:49:18 CET 2012 - jsuchome(a)suse.cz - change mode of sssd.conf file after writing (workaround for Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/kerbe… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp Mon Feb 6 12:15:38 2012 @@ -525,13 +525,8 @@ SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing sssd.conf file"); + y2error ("error writing ldap.conf file"); } - else - { - // workadound for ini-agent bug (bnc#743355) - SCR::Execute (.target.bash, "/bin/chmod 600 /etc/sssd/sssd.conf"); - } } else if (use_pam_krb) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67366 - /tags/branch-Code-11-SP2-2_17_34/ldap-client/
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:15:05 2012 New Revision: 67366 URL: http://svn.opensuse.org/viewcvs/yast?rev=67366&view=rev Log: Created tag branch-Code-11-SP2-2_17_34 for ldap-client Added: tags/branch-Code-11-SP2-2_17_34/ldap-client/ (props changed) - copied from r67365, branches/SuSE-Code-11-SP2-Branch/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67365 - /tags/branch-Code-11-SP2-2_17_34/
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:15:03 2012 New Revision: 67365 URL: http://svn.opensuse.org/viewcvs/yast?rev=67365&view=rev Log: Created tag branch-Code-11-SP2-2_17_34 Added: tags/branch-Code-11-SP2-2_17_34/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67364 - in /branches/SuSE-Code-11-SP2-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:14:43 2012 New Revision: 67364 URL: http://svn.opensuse.org/viewcvs/yast?rev=67364&view=rev Log: - removed previous workaround (bnc#743355 fixed properly) - 2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION Mon Feb 6 12:14:43 2012 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes Mon Feb 6 12:14:43 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 08:36:00 CET 2012 - jsuchome(a)suse.cz + +- removed previous workaround (bnc#743355 fixed properly) +- 2.17.34 + +------------------------------------------------------------------- Thu Jan 26 15:47:22 CET 2012 - jsuchome(a)suse.cz - change mode of sssd.conf file after writing (workaround for Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Mon Feb 6 12:14:43 2012 @@ -2240,10 +2240,9 @@ */ global boolean WriteSSSDConfig () { - string file = "/etc/sssd/sssd.conf"; - if (!FileUtils::Exists (file)) + if (!FileUtils::Exists ("/etc/sssd/sssd.conf")) { - y2warning ("file %1 does not exists: not writing", file); + y2warning ("file /etc/sssd/sssd.conf does not exists: not writing"); return false; } @@ -2306,13 +2305,8 @@ if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing %1 file", file); + y2error ("error writing ldap.conf file"); } - else - { - // workadound for ini-agent bug (bnc#743355) - SCR::Execute (.target.bash, sformat ("/bin/chmod 600 %1", file)); - } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67363 - /trunk/ycp-ui-bindings/examples/LogView2.ycp
by tgoettlicher＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: tgoettlicher Date: Fri Feb 3 17:16:32 2012 New Revision: 67363 URL: http://svn.opensuse.org/viewcvs/yast?rev=67363&view=rev Log: added an example for logview Added: trunk/ycp-ui-bindings/examples/LogView2.ycp Added: trunk/ycp-ui-bindings/examples/LogView2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/LogView… ============================================================================== --- trunk/ycp-ui-bindings/examples/LogView2.ycp (added) +++ trunk/ycp-ui-bindings/examples/LogView2.ycp Fri Feb 3 17:16:32 2012 @@ -0,0 +1,25 @@ +{ + + any button = nil; + + + UI::OpenDialog( + `VBox( + `LogView(`id(`log), + "Log View ", + 15, // visible lines + 0), // lines to store + `PushButton(`id(`ok), "&OK") + ) + ); + + repeat + { + string line = tostring(random(100)); + UI::ChangeWidget(`id(`log), `LastLine, line ); + button = UI::TimeoutUserInput(100); + + } until ( button == `ok ); + + UI::CloseDialog(); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67362 - in /trunk/core/agent-ini/testsuite/multi: private.err private.in.0 private.in.1 private.in.2 private.in.3 private.out private.scr private.ycp
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 16:57:39 2012 New Revision: 67362 URL: http://svn.opensuse.org/viewcvs/yast?rev=67362&view=rev Log: Better test cases for section_private (bnc#743355). Added: trunk/core/agent-ini/testsuite/multi/private.in.0 trunk/core/agent-ini/testsuite/multi/private.in.1 trunk/core/agent-ini/testsuite/multi/private.in.3 Modified: trunk/core/agent-ini/testsuite/multi/private.err trunk/core/agent-ini/testsuite/multi/private.in.2 trunk/core/agent-ini/testsuite/multi/private.out trunk/core/agent-ini/testsuite/multi/private.scr trunk/core/agent-ini/testsuite/multi/private.ycp Modified: trunk/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.err (original) +++ trunk/core/agent-ini/testsuite/multi/private.err Fri Feb 3 16:57:39 2012 @@ -1,11 +1,45 @@ +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.0.test to 0 +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 1 to .v."1"."Totalise"."Password" -[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Totalise to .v."1"."Totalise"."Password" -[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" -[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.3.test to 3 +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."0".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."0".Section.Key = "existing public implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."1".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1".Section.Key = "existing public explicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."2".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2".Section.Key = "existing private implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."3".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."3".Section.Key = "existing private explicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 4 to .v."4".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."4".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."4".Section.Key = "new public implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 5 to .v."5".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."5".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."5".Section.Key = "new public explicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 6 to .v."6".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."6".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."6".Section.Key = "new private implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 7 to .v."7".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."7".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."7".Section.Key = "new private explicit" +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.0.test to 0 +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.3.test to 3 +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 0 to multi/private.in.0.test [agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test -[YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] -[YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 3 to multi/private.in.3.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 4 to multi/private.in.4.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 5 to multi/private.in.5.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 6 to multi/private.in.6.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 7 to multi/private.in.7.test +[YCP] multi/private.ycp:XXX existing public implicit file mode: 644 +[YCP] multi/private.ycp:XXX existing public explicit file mode: 644 +[YCP] multi/private.ycp:XXX existing private implicit file mode: 600 +[YCP] multi/private.ycp:XXX existing private explicit file mode: 600 +[YCP] multi/private.ycp:XXX new public implicit file mode: 644 +[YCP] multi/private.ycp:XXX new public explicit file mode: 644 +[YCP] multi/private.ycp:XXX new private implicit file mode: 644 +[YCP] multi/private.ycp:XXX new private explicit file mode: 600 [agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Added: trunk/core/agent-ini/testsuite/multi/private.in.0 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== (empty) Added: trunk/core/agent-ini/testsuite/multi/private.in.1 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== (empty) Modified: trunk/core/agent-ini/testsuite/multi/private.in.2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.in.2 (original) +++ trunk/core/agent-ini/testsuite/multi/private.in.2 Fri Feb 3 16:57:39 2012 @@ -1,11 +0,0 @@ -[Dialer arcor] -Compuserve = 0 -Provider = Arcor -[End] - -[Dialer mobilcom] -Compuserve = 0 -Provider = Mobilcom -Phone = 0101901929 -[End] - Added: trunk/core/agent-ini/testsuite/multi/private.in.3 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== (empty) Modified: trunk/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.out (original) +++ trunk/core/agent-ini/testsuite/multi/private.out Fri Feb 3 16:57:39 2012 @@ -1,17 +1,25 @@ (nil) +multi/private.in.0.test ------------------------------- +[Section] +Key = existing public implicit multi/private.in.1.test ------------------------------- -[Dialer Totalise] - Password = Secret password -[End] +[Section] +Key = existing public explicit multi/private.in.2.test ------------------------------- -[Dialer arcor] - Compuserve = 0 - Provider = Arcor - Password = Public password -[End] - -[Dialer mobilcom] - Compuserve = 0 - Provider = Mobilcom - Phone = 0101901929 -[End] +[Section] +Key = existing private implicit +multi/private.in.3.test ------------------------------- +[Section] +Key = existing private explicit +multi/private.in.4.test ------------------------------- +[Section] +Key = new public implicit +multi/private.in.5.test ------------------------------- +[Section] +Key = new public explicit +multi/private.in.6.test ------------------------------- +[Section] +Key = new private implicit +multi/private.in.7.test ------------------------------- +[Section] +Key = new private explicit Modified: trunk/core/agent-ini/testsuite/multi/private.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.scr (original) +++ trunk/core/agent-ini/testsuite/multi/private.scr Fri Feb 3 16:57:39 2012 @@ -6,12 +6,11 @@ "rewrite" : [ [ "multi/private\.in\.(.)\.test$", "multi/private.in.%s.test"], ], - "subindent" : " ", + "subindent" : "", "comments": [ "^[ \t]*#.*", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\[Dialer[ \t]+(.*[^ \t])[ \t]*\\][ \t]*", "[Dialer %s]" ], - "end" : [ "^[ \t]*\\[End\\][ \t]*$", "[End]", ], + "begin" : [ "[ \t]*\\[(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], ], ], "params" : [ Modified: trunk/core/agent-ini/testsuite/multi/private.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.ycp (original) +++ trunk/core/agent-ini/testsuite/multi/private.ycp Fri Feb 3 16:57:39 2012 @@ -1,26 +1,49 @@ -// -// Multiple files test -// -// providers.rpm -// - +// test private files, bnc#743355 { SCR::RegisterAgent (.target, `ag_system ()); - any out = nil; - - SCR::Write (.v."1"."Totalise"."Password", "Secret password"); - SCR::Write (.section_private."1", true); - - SCR::Write (.v."2"."arcor"."Password", "Public password"); + // 8 combinations to test + // bitmask: + // 4: new file, 0: existing file + // 2: secret 0: public + // 1: explicit with section_private 0: implicit with permisions of existing file + + // #2, existing private implicit, was the one reported about sssd.conf + // #6, new private implicit, is a contradiciton in requirements, XFAIL + + string description(integer i) { + string new_s = ((i & 4) != 0)? + "new ": + "existing "; + string private_s = ((i & 2) != 0)? + "private ": + "public "; + string explicit_s = ((i & 1) != 0)? + "explicit": + "implicit"; + return new_s + private_s + explicit_s; + } + + // fix permissions of fixtures from svn/git + foreach(integer i, [2, 3], { + SCR::Execute (.target.bash, sformat("chmod 600 multi/private.in.%1.test", i)); + }); + + foreach(integer i, [0, 1, 2, 3, 4, 5, 6, 7], { + string i_str = tostring(i); + SCR::Write (add(add(.v, i_str), .Section.Key), description(i)); + + if ((i & 1) != 0) { + SCR::Write (add(.section_private, i_str), (i & 2) != 0); + } + }); SCR::Write (., nil); //flush - out = SCR::Execute (.target.bash_output, "stat -c %a multi/private.in.1.test"); - y2milestone("secret file mode: %1", out); - - out = SCR::Execute (.target.bash_output, "stat -c %a multi/private.in.2.test"); - y2milestone("public file mode: %1", out); + foreach(integer i, [0, 1, 2, 3, 4, 5, 6, 7], { + map out = (map) SCR::Execute (.target.bash_output, sformat("stat -c %%a multi/private.in.%1.test", i)); + y2milestone("%1 file mode: %2", description(i), out["stdout"]:""); + }); return nil; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67361 - in /trunk/core: ./ agent-ini/src/ agent-ini/testsuite/multi/ package/
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 16:55:59 2012 New Revision: 67361 URL: http://svn.opensuse.org/viewcvs/yast?rev=67361&view=rev Log: ini-agent: only change permissions of new files (bnc#743355) svn merge -c67360 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/core Removed: trunk/core/agent-ini/testsuite/multi/private.in.1 Modified: trunk/core/ (props changed) trunk/core/VERSION trunk/core/agent-ini/src/IniParser.cc trunk/core/agent-ini/testsuite/multi/private.err trunk/core/agent-ini/testsuite/multi/private.out trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=67361&r1=67360&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Feb 3 16:55:59 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/core/agent-ini/src/IniParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/src/IniParser.cc?… ============================================================================== --- trunk/core/agent-ini/src/IniParser.cc (original) +++ trunk/core/agent-ini/src/IniParser.cc Fri Feb 3 16:55:59 2012 @@ -1000,8 +1000,6 @@ mode_t file_umask = section.isPrivate()? 0077: 0022; mode_t orig_umask = umask(file_umask); - // rewriting an existing file wouldnt change its mode - unlink(filename.c_str()); ofstream of(filename.c_str()); if (!of.good()) { Modified: trunk/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.err (original) +++ trunk/core/agent-ini/testsuite/multi/private.err Fri Feb 3 16:55:59 2012 @@ -1,11 +1,11 @@ -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 1 to .v."1"."Totalise"."Password" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Totalise to .v."1"."Totalise"."Password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] [YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] [agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Modified: trunk/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.out (original) +++ trunk/core/agent-ini/testsuite/multi/private.out Fri Feb 3 16:55:59 2012 @@ -1,16 +1,8 @@ (nil) multi/private.in.1.test ------------------------------- [Dialer Totalise] - Compuserve = 0 - Provider = Totalise - Phone = 08453001470 Password = Secret password [End] - -[Dialer force9] - Provider = Force9 - Phone = 08451424000 -[End] multi/private.in.2.test ------------------------------- [Dialer arcor] Compuserve = 0 Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Feb 3 16:55:59 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 14:36:31 CET 2012 - mvidner(a)suse.cz + +- ini-agent: only change permissions of new files (bnc#743355) +- 2.22.3 + +------------------------------------------------------------------- Thu Jan 5 15:08:14 CET 2012 - mvidner(a)suse.cz - Relicensed agent-process from GPL-2.0 to GPL-2.0+ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67360 - in /branches/SuSE-Code-11-SP2-Branch/core: ./ agent-ini/src/ agent-ini/testsuite/multi/ package/
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 15:04:51 2012 New Revision: 67360 URL: http://svn.opensuse.org/viewcvs/yast?rev=67360&view=rev Log: ini-agent: only change permissions of new files (bnc#743355) *quick* adjustment of tests: only test creation, not yet the sssd.conf case of implicit existing private Removed: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.1 Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/core/VERSION Fri Feb 3 15:04:51 2012 @@ -1 +1 @@ -2.17.43 +2.17.44 Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc Fri Feb 3 15:04:51 2012 @@ -1000,8 +1000,6 @@ mode_t file_umask = section.isPrivate()? 0077: 0022; mode_t orig_umask = umask(file_umask); - // rewriting an existing file wouldnt change its mode - unlink(filename.c_str()); ofstream of(filename.c_str()); if (!of.good()) { Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err Fri Feb 3 15:04:51 2012 @@ -1,11 +1,11 @@ -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 1 to .v."1"."Totalise"."Password" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Totalise to .v."1"."Totalise"."Password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] [YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] [agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out Fri Feb 3 15:04:51 2012 @@ -1,16 +1,8 @@ (nil) multi/private.in.1.test ------------------------------- [Dialer Totalise] - Compuserve = 0 - Provider = Totalise - Phone = 08453001470 Password = Secret password [End] - -[Dialer force9] - Provider = Force9 - Phone = 08451424000 -[End] multi/private.in.2.test ------------------------------- [Dialer arcor] Compuserve = 0 Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Fri Feb 3 15:04:51 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 14:36:31 CET 2012 - mvidner(a)suse.cz + +- ini-agent: only change permissions of new files (bnc#743355) +- 2.17.44 + +------------------------------------------------------------------- Thu Jan 5 15:08:14 CET 2012 - mvidner(a)suse.cz - Relicensed agent-process from GPL-2.0 to GPL-2.0+ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67359 - in /branches/SuSE-Code-11-SP2-Branch/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 13:58:55 2012 New Revision: 67359 URL: http://svn.opensuse.org/viewcvs/yast?rev=67359&view=rev Log: Fix detection of properly configured LCS and CTC devices (bnc#741071#c25) Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Fri Feb 3 13:58:55 2012 @@ -1 +1 @@ -2.17.170 +2.17.171 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Feb 3 13:58:55 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 13:52:59 CET 2012 - mvidner(a)suse.cz + +- Fix detection of properly configured LCS and CTC devices (bnc#741071#c20) +- 2.17.171 + +------------------------------------------------------------------- Thu Jan 26 16:05:05 CET 2012 - mvidner(a)suse.cz - Only save LLADDR (persistent MAC) for some s390 card types, Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Fri Feb 3 13:58:55 2012 @@ -1508,23 +1508,20 @@ case "qeth": case "hsi": string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; -/* - if (size(chan_mode)>0) - // chan_ids (read, write, control), port - command1=sformat("qeth_configure %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids); - else - command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids); -*/ string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : ""; string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : ""; command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, (qeth_layer2==true)?"-l":"", portname_param, portnumber_param, qeth_chanids); command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "ctc": + // chan_ids (read, write), protocol + command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); + command2=sformat("ls /sys/devices/ctcm/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + break; case "lcs": // chan_ids (read, write), protocol command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); - command2=sformat("ls /sys/devices/cu3088/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + command2=sformat("ls /sys/devices/lcs/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "iucv": // router -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67358 - /tags/branch-Code-11-SP2-2_17_33/iscsi-client/
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 18:35:11 2012 New Revision: 67358 URL: http://svn.opensuse.org/viewcvs/yast?rev=67358&view=rev Log: Created tag branch-Code-11-SP2-2_17_33 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_33/iscsi-client/ (props changed) - copied from r67357, branches/SuSE-Code-11-SP2-Branch/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67357 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: aschnell Date: Thu Feb 2 18:10:02 2012 New Revision: 67357 URL: http://svn.opensuse.org/viewcvs/yast?rev=67357&view=rev Log: - increased version Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Thu Feb 2 18:10:02 2012 @@ -1 +1 @@ -2.17.125 +2.17.126 Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Feb 2 18:10:02 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Jan 31 14:47:10 CET 2012 - aschnell(a)suse.de +- 2.17.126 - add by-id names to alt-names of DmPartCo (bnc#744194) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67356 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 17:09:27 2012 New Revision: 67356 URL: http://svn.opensuse.org/viewcvs/yast?rev=67356&view=rev Log: version 2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Thu Feb 2 17:09:27 2012 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Feb 2 17:09:27 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de +- 2.17.33 - call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67355 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 16:06:17 2012 New Revision: 67355 URL: http://svn.opensuse.org/viewcvs/yast?rev=67355&view=rev Log: call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Feb 2 16:06:17 2012 @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de + +- call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) + +------------------------------------------------------------------- +Wed Feb 1 19:34:51 CET 2012 - fehr(a)suse.de - create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 16:06:17 2012 @@ -381,7 +381,7 @@ } ret = writeInitiatorName(initiatorname); } else { - y2internal("initiatorname=%1", initiatorname); + y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. @@ -661,18 +661,26 @@ { iface_file = $[]; list<string> files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); - y2milestone( "files:%1", files ); + y2milestone( "InitIfaceFile files:%1", files ); + if( files==nil || size(files)==0 ) + { + string cmd = GetAdmCmd("-m iface"); + y2milestone( "InitIfaceFile cmd:%1", cmd ); + y2milestone( "InitIfaceFile ret:%1", SCR::Execute(.target.bash_output, cmd)); + files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); + y2milestone( "InitIfaceFile files:%1", files ); + } foreach( string file, files, { list<string> ls = splitstring( (string)SCR::Read(.target.string, "/etc/iscsi/ifaces/"+file), "\n" ); - y2milestone( "file:%1", file ); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile file:%1", file ); + y2milestone( "InitIfaceFile ls:%1", ls ); ls = filter( string l, ls, ``(search(l,"iface.iscsi_ifacename")!=nil)); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile ls:%1", ls ); if( size(ls)>0 ) iface_file[splitstring(deletechars(ls[0]:""," "),"=")[1]:""] = file; }); - y2milestone( "iface_file:%1", iface_file ); + y2milestone( "InitIfaceFile iface_file:%1", iface_file ); } global list<term> GetOffloadItems() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67354 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 16:05:17 2012 New Revision: 67354 URL: http://svn.opensuse.org/viewcvs/yast?rev=67354&view=rev Log: call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Thu Feb 2 16:05:17 2012 @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de + +- call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) + +------------------------------------------------------------------- +Wed Feb 1 19:34:51 CET 2012 - fehr(a)suse.de - create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 16:05:17 2012 @@ -661,18 +661,26 @@ { iface_file = $[]; list<string> files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); - y2milestone( "files:%1", files ); + y2milestone( "InitIfaceFile files:%1", files ); + if( files==nil || size(files)==0 ) + { + string cmd = GetAdmCmd("-m iface"); + y2milestone( "InitIfaceFile cmd:%1", cmd ); + y2milestone( "InitIfaceFile ret:%1", SCR::Execute(.target.bash_output, cmd)); + files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); + y2milestone( "InitIfaceFile files:%1", files ); + } foreach( string file, files, { list<string> ls = splitstring( (string)SCR::Read(.target.string, "/etc/iscsi/ifaces/"+file), "\n" ); - y2milestone( "file:%1", file ); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile file:%1", file ); + y2milestone( "InitIfaceFile ls:%1", ls ); ls = filter( string l, ls, ``(search(l,"iface.iscsi_ifacename")!=nil)); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile ls:%1", ls ); if( size(ls)>0 ) iface_file[splitstring(deletechars(ls[0]:""," "),"=")[1]:""] = file; }); - y2milestone( "iface_file:%1", iface_file ); + y2milestone( "InitIfaceFile iface_file:%1", iface_file ); } global list<term> GetOffloadItems() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67353 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: gs Date: Thu Feb 2 15:39:12 2012 New Revision: 67353 URL: http://svn.opensuse.org/viewcvs/yast?rev=67353&view=rev Log: handle tabs inside <pre> correctly Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 2 15:39:12 2012 @@ -355,11 +355,12 @@ NCtext ftext( nctxt ); int len = textWidth( wtxt ); - + if ( cc + len > textwidth ) { textwidth = cc + len; - AdjustPad( wsze(cl+ftext.Lines(), textwidth) ); + AdjustPad( wsze(cl + ftext.Lines(), textwidth) ); + yuiDebug() << "Adjust: " << cl+ftext.Lines() << " " << textwidth << endl; } // insert the text @@ -368,8 +369,10 @@ while ( *sch ) { myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth( *sch ); + if ( iswprint( *sch ) ) + cc += wcwidth( *sch ); // wcwidth for \t returns -1 + ++sch; } } @@ -465,12 +468,24 @@ } else { - if ( *wch != L'\r' ) // skip carriage return + switch ( *wch ) { - myPad()->addwstr( wch, 1 ); // add the wide chararacter - cc += wcwidth( *wch ); - if ( *wch == '\n' ) - PadNL(); + case L' ': // add white space + myPad()->addwstr( wch, 1 ); + cc+=wcwidth( *wch ); + break; + + case L'\n': + PadNL(); // add new line + break; + + case L'\t': // add tab + myPad()->addwstr( wch, 1 ); + cc += myPad()->tabsize(); + break; + + default: + yuiDebug() << "Ignoring " << *wch << endl; } ++wch; } @@ -506,7 +521,7 @@ PadBOL(); AdjustPad( wsze( cl, textwidth ) ); - yuiMilestone() << "adjust: lines: " << cl << " columns: " << textwidth << endl; + yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -589,7 +604,8 @@ /** * Get the number of columns needed to print a 'wstring'. Only printable characters - * are taken into account because others would return -1 (e.g. '\n'). + * are taken into account because otherwise 'wcwidth' would return -1 (e.g. for '\n'). + * Tabs are calculated with tabsize(). * Attention: only use textWidth() to calculate space, not for iterating through a text * or to get the length of a text (real text length includes new lines). */ @@ -602,7 +618,13 @@ { // check whether char is printable if ( iswprint( *wstr_it ) ) - len += wcwidth( *wstr_it ); + { + len += wcwidth( *wstr_it ); + } + else if ( *wstr_it == '\t' ) + { + len += myPad()->tabsize(); + } } return len; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67352 - /tags/stable-2_22_3/ldap-client/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 15:09:26 2012 New Revision: 67352 URL: http://svn.opensuse.org/viewcvs/yast?rev=67352&view=rev Log: Created tag stable-2_22_3 for ldap-client Added: tags/stable-2_22_3/ldap-client/ - copied from r67351, trunk/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67351 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/ui.ycp testsuite/tests/LDAPInit.out
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 15:08:40 2012 New Revision: 67351 URL: http://svn.opensuse.org/viewcvs/yast?rev=67351&view=rev Log: - removed option to switch off TLS/SSL from UI - offered only SSSD in UI (fate#313143) - 2.22.3 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/testsuite/tests/LDAPInit.out Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67351&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Feb 2 15:08:40 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Feb 2 15:08:40 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 2 15:00:26 CET 2012 - jsuchome(a)suse.cz + +- removed option to switch off TLS/SSL from UI +- offered only SSSD in UI (fate#313143) +- 2.22.3 + +------------------------------------------------------------------- Thu Jan 19 14:56:43 CET 2012 - jsuchome(a)suse.cz - removed obsolete version 2 reference (fate#313143) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=673… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Feb 2 15:08:40 2012 @@ -128,7 +128,7 @@ string old_base_dn = nil; boolean base_dn_changed = false; - global boolean ldap_tls = false; + global boolean ldap_tls = true; // CA certificates for server certificate verification // At least one of these are required if tls_checkpeer is "yes" Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67351… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Feb 2 15:08:40 2012 @@ -179,6 +179,88 @@ } /** + * Popup for TLS/SSL related stuff + */ + boolean SSLConfiguration () { + + string tls_cacertdir = Ldap::tls_cacertdir; + string tls_cacertfile = Ldap::tls_cacertfile; + UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (1), `VBox( + `VSpacing (0.5), + `HSpacing (75), + `HBox ( + `InputField (`id (`tls_cacertdir), `opt (`hstretch), + // inputfield label + _("Cer&tificate Directory"), tls_cacertdir), + `VBox (`Bottom ( + // button label + `PushButton (`id(`br_tls_cacertdir), _("B&rowse")) + )) + ), + `HBox ( + `InputField (`id (`tls_cacertfile), `opt (`hstretch), + // inputfield label + _("CA Cert&ificate File"), tls_cacertfile), + `VBox (`Bottom ( + // button label + `PushButton (`id(`br_tls_cacertfile), _("Brows&e")) + )) + ), + `HBox ( + `InputField (`id (`url), `opt (`hstretch), + // inputfield label + _("CA Certificate URL for Download")), + `VBox (`Bottom ( + // push button label + `PushButton (`id(`import_cert), _("Do&wnload CA Certificate")) + )) + ), + `ButtonBox ( + `PushButton (`id(`ok), Label::OKButton()), + `PushButton (`id(`cancel), Label::CancelButton()) + ), + `VSpacing (0.5) + ), `HSpacing (1))); + symbol ret = `again; + do + { + ret = (symbol) UI::UserInput (); + if (ret == `br_tls_cacertdir) + { + string dir = UI::AskForExistingDirectory (tls_cacertdir, + // popup label + _("Choose the directory with certificates")); + if (dir != nil) + { + tls_cacertdir = dir; + UI::ChangeWidget (`id (`tls_cacertdir), `Value, dir); + } + } + if (ret == `br_tls_cacertfile) + { + string file = UI::AskForExistingFile (tls_cacertfile, "*.pem *.crt", + // popup label + _("Choose the certificate file")); + if (file != nil) + { + tls_cacertfile = file; + UI::ChangeWidget (`id (`tls_cacertfile), `Value, file); + } + } + } while (ret != `ok && ret != `cancel); + + UI::CloseDialog (); + + if (ret == `ok) + { + Ldap::tls_cacertfile = tls_cacertfile; + Ldap::tls_cacertdir = tls_cacertdir; + } + + return ret == `ok; + } + + /** * The main dialog for ldap-client configuration * @return `back, `next or `abort */ @@ -236,13 +318,13 @@ boolean installation = Stage::cont () && !contains (WFM::Args (), "from_users"); boolean start = Ldap::start || installation; - boolean sssd = Ldap::sssd; string base_dn = Ldap::GetBaseDN (); string server = Ldap::server; boolean ldap_tls = Ldap::ldap_tls || Ldap::sssd; // force TLS to true if sssd is used string tls_checkpeer = Ldap::tls_checkpeer; boolean login_enabled = Ldap::login_enabled; string certTmpFile = sformat ("%1/__LDAPcert.crt", Directory::tmpdir); + boolean ssl_changed = false; boolean autofs = Ldap::_start_autofs; term autofs_con = `Empty (); if (Ldap::_autofs_allowed) @@ -257,12 +339,17 @@ boolean mkhomedir = Ldap::mkhomedir; term mkhomedir_term = `VBox ( - Ldap::_autofs_allowed ? `VSpacing (0) : `VSpacing (0.5), `Left(`CheckBox(`id(`mkhomedir), // checkbox label _("C&reate Home Directory on Login"), mkhomedir )) ); + term disable_login_term = `VBox ( + `Left (`CheckBox (`id (`ldapnologin), + // checkbox label + _("Disable User &Logins"), !login_enabled + )) + ); term con = `VCenter (`HBox (`HSpacing (3), `VBox ( `VSpacing (0.5), @@ -276,18 +363,9 @@ _("Do &Not Use LDAP"), !start)), `Left(`RadioButton(`id(`ldapyes), `opt (`notify), // radio button label - _("&Use LDAP"), start)), - `Left(`RadioButton(`id(`ldapnologin), `opt (`notify), - // radio button label - _("Use LDAP but Disable &Logins"), - start && !login_enabled)) + _("&Use LDAP"), start)) ))) ), - `VSpacing (0.4), - `Left (`CheckBox (`id (`sssd), `opt (`notify), - // checkbox label - _("Use S&ystem Security Services Daemon (SSSD)"), sssd - )), `VSpacing (0.4) ))), `VSpacing (0.4), @@ -316,20 +394,16 @@ ), `VSpacing (0.4) ), `HSpacing (0.5))), - `Frame (_("Secure Connection"), `HBox (`HSpacing (0.5), `VBox( - `HBox ( - // check box label - `Left (`CheckBox (`id(`ldaps), `opt (`notify), _("LDAP &TLS/SSL"), ldap_tls)), - // push button label - `PushButton (`id(`import_cert), _("Do&wnload CA Certificate")) - ), - `VSpacing (0.2) - ), `HSpacing (0.5))), autofs_con, mkhomedir_term, - `VSpacing(0.4), - // pushbutton label - `PushButton (`id(`advanced), _("&Advanced Configuration...")) + disable_login_term, + `VSpacing (), + `HBox ( + // pushbutton label + `PushButton (`id(`ssl_config), _("SSL/TLS Configuration...")), + // pushbutton label + `PushButton (`id(`advanced), _("&Advanced Configuration...")) + ) ), `HSpacing (3))); Wizard::SetContentsButtons ( @@ -345,9 +419,6 @@ UI::ChangeWidget (`id(`server),`ValidChars, Address::ValidChars + " "); - UI::ChangeWidget (`id(`import_cert),`Enabled, ldap_tls); - // do not alow to turn off TLS when SSSD is used - UI::ChangeWidget (`id (`ldaps), `Enabled, !sssd); symbol result = `not_next; do { @@ -355,20 +426,15 @@ any rb = UI::QueryWidget(`id(`rd), `CurrentButton); start = (rb != `ldapno); - login_enabled = (rb != `ldapnologin); + login_enabled = UI::QueryWidget (`id (`ldapnologin), `Value) != true; - sssd = (boolean) UI::QueryWidget (`id (`sssd), `Value); server = (string) UI::QueryWidget(`id(`server), `Value); - ldap_tls = (boolean) UI::QueryWidget(`id(`ldaps), `Value); mkhomedir = (boolean) UI::QueryWidget (`id(`mkhomedir),`Value); - UI::ChangeWidget (`id(`import_cert), `Enabled, ldap_tls); - - if (result == `sssd) - { - UI::ChangeWidget (`id (`ldaps), `Value, true); - UI::ChangeWidget (`id (`ldaps), `Enabled, !sssd); - } + if (result == `ssl_config) + { + ssl_changed = SSLConfiguration () || ssl_changed; + } if (result == `slp) { string srv = ""; @@ -538,7 +604,7 @@ } } - list<string> needed_packages = sssd ? Ldap::sssd_packages : Ldap::pam_nss_packages; + list<string> needed_packages = Ldap::sssd_packages; if (Ldap::sssd_with_krb) needed_packages = (list<string>) union (needed_packages, Ldap::kerberos_packages); @@ -587,19 +653,12 @@ if (result == `next || result == `advanced) { - if (Ldap::GetBaseDN() != base_dn && - Ldap::nss_base_passwd == Ldap::GetBaseDN ()) - { - Ldap::nss_base_passwd = base_dn; - Ldap::nss_base_shadow = base_dn; - Ldap::nss_base_group = base_dn; - } if (Ldap::start != start || Ldap::GetBaseDN() != base_dn || Ldap::server != server || Ldap::ldap_tls != ldap_tls || Ldap::_start_autofs != autofs || Ldap::login_enabled != login_enabled || Ldap::mkhomedir != mkhomedir || - Ldap::sssd != sssd + ssl_changed ) { if (result == `next) @@ -655,7 +714,6 @@ Ldap::_start_autofs = autofs; Ldap::login_enabled = login_enabled; Ldap::mkhomedir = mkhomedir; - Ldap::sssd = sssd; Ldap::modified = true; } } @@ -674,19 +732,11 @@ // help text caption 1 _("Advanced LDAP Client Settings") + - (Ldap::sssd ? - // help text 1/3 _("If Kerberos authentication should be used, specify the realm and KDC Address. Determine if user credentials should be cached locally by checking SSSD Offline Authentication. For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>. -") : - - // help text 1/3 - _("Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are -set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes -in /etc/ldap.conf file. -")) + +") + // help text 2/3 _("Password Change Protocol refers to the pam_password attribute of the\n<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.") + @@ -754,12 +804,7 @@ string base_config_dn = Ldap::GetMainConfigDN(); boolean create_ldap = Ldap::create_ldap; boolean append_base = (bind_dn != "" && issubstring (bind_dn, base_dn)); - string nss_base_passwd = Ldap::nss_base_passwd; - string nss_base_shadow = Ldap::nss_base_shadow; - string nss_base_group = Ldap::nss_base_group; string pam_password = Ldap::pam_password; - string tls_cacertdir = Ldap::tls_cacertdir; - string tls_cacertfile = Ldap::tls_cacertfile; string krb5_realm = Ldap::krb5_realm; string krb5_kdcip = Ldap::krb5_kdcip; boolean sssd_with_krb = Ldap::sssd_with_krb; @@ -885,61 +930,25 @@ ); } - term get_frame_nss () { - return - // frame label - `Frame (_("Naming Contexts"), `HBox( - `HSpacing (1), `VBox( - `VSpacing(0.4), - `HBox ( - `InputField (`id (`nss_base_passwd), `opt (`hstretch), - // textentry label - _("&User Map"), nss_base_passwd), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_passwd), _("&Browse")) - ) - ), - `HBox ( - `InputField (`id (`nss_base_shadow), `opt (`hstretch), - // textentry label - _("&Password Map"), nss_base_shadow), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_shadow), _("Brow&se")) - ) - ), - `HBox ( - `InputField (`id (`nss_base_group), `opt (`hstretch), - // textentry label - _("&Group Map"), nss_base_group), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_group), _("Bro&wse")) - ) - ), - `VSpacing(0.4) - ), - `HSpacing (1) - )); - } - term get_frame_krb () { - return - // frame label - `Frame (_("Basic SSSD Settings"), `HBox (`HSpacing (1), `VBox ( + + define void set_client_term () { + + + term cont = `Top (`HBox(`HSpacing (4), `VBox( + `VSpacing (1), + // checkbox label `Left (`CheckBox (`id (`sssd_with_krb), `opt (`notify), _("&Use Kerberos"), sssd_with_krb)), `VSpacing(0.4), `HBox ( + `HSpacing (2), // textentry label `TextEntry (`id (`krb5_realm), _("Default Real&m"), krb5_realm), // textentry label `TextEntry (`id (`krb5_kdcip), _("&KDC Server Address"), krb5_kdcip) ), + `VSpacing (), // combobox label `ComboBox (`id (`sssd_ldap_schema), `opt (`notify, `hstretch), _("LDAP Schema"), maplist (string s, ldap_schemas, ``(`item (`id (s), s, s == sssd_ldap_schema))) @@ -958,46 +967,15 @@ `Left (`CheckBox (`id (`sssd_cache_credentials), _("SSSD O&ffline Authentication"), sssd_cache_credentials)) ), - `VSpacing (0.4) - ), `HSpacing (1))); - } - - define void set_client_term () { - term cont = `Top (`HBox(`HSpacing (5), `VBox( - `VSpacing(0.4), - `VBox (Ldap::sssd ? get_frame_krb () : get_frame_nss ()), - `VSpacing (0.4), + `VSpacing (), `ComboBox (`id (`pam_password), `opt(`notify,`hstretch,`editable), // combobox label _("Passwor&d Change Protocol"), pam_password_items), `ComboBox (`id (`group_style), `opt (`notify, `hstretch), // combobox label - _("Group Member &Attribute"), member_attributes), - // check box label - `VSpacing(0.4), - `HBox ( - `HWeight (1, `HBox ( - `InputField (`id (`tls_cacertdir), `opt (`hstretch), _("Cer&tificate Directory"), - tls_cacertdir - ), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_tls_cacertdir), _("B&rowse")) - ) - )), `HWeight (1, `HBox ( - `InputField (`id (`tls_cacertfile), `opt (`hstretch), _("CA Cert&ificate File"), - tls_cacertfile - ), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_tls_cacertfile), _("Brows&e")) - ) - )) - ) - ), `HSpacing (5))); + _("Group Member &Attribute"), member_attributes) + ), `HSpacing (4))); UI::ReplaceWidget (`tabContents, cont); if (has_tabs) @@ -1011,7 +989,7 @@ define void set_admin_term () { - term cont = `HBox (`HSpacing (5), `VBox( + term cont = `HBox (`HSpacing (4), `VBox( `VSpacing (0.4), `HBox ( `InputField (`id (`base_config_dn), `opt (`hstretch), @@ -1061,7 +1039,7 @@ `HStretch () ), `VSpacing(0.4) - ), `HSpacing (5)); + ), `HSpacing (4)); UI::ReplaceWidget (`tabContents, cont); if (has_tabs) @@ -1103,32 +1081,18 @@ { member_attribute =(string)UI::QueryWidget(`id(`group_style),`Value); - if (Ldap::sssd) - { - krb5_realm = (string) + krb5_realm = (string) UI::QueryWidget (`id (`krb5_realm), `Value); - krb5_kdcip = (string) + krb5_kdcip = (string) UI::QueryWidget (`id (`krb5_kdcip), `Value); - sssd_cache_credentials = (boolean) + sssd_cache_credentials = (boolean) UI::QueryWidget (`id (`sssd_cache_credentials), `Value); - sssd_enumerate = (boolean) + sssd_enumerate = (boolean) UI::QueryWidget (`id (`sssd_enumerate), `Value); - sssd_ldap_schema= (string) + sssd_ldap_schema= (string) UI::QueryWidget (`id (`sssd_ldap_schema), `Value); - } - else - { - nss_base_passwd = (string) - UI::QueryWidget(`id(`nss_base_passwd),`Value); - nss_base_shadow = (string) - UI::QueryWidget(`id(`nss_base_shadow),`Value); - nss_base_group = (string) - UI::QueryWidget(`id(`nss_base_group),`Value); - } pam_password = (string) UI::QueryWidget(`id(`pam_password), `Value); - tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); - tls_cacertdir = (string) UI::QueryWidget(`id(`tls_cacertdir), `Value); } if (current == `admin) { @@ -1156,8 +1120,7 @@ } // 3. other events - if (is (result, symbol) && - contains ([`br, `br_passwd, `br_shadow, `br_group ], (symbol)result)) + if (result == `br) { if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) { @@ -1174,13 +1137,7 @@ ]); if (dn != "") { - map br2entry = $[ - `br : `base_config_dn, - `br_passwd : `nss_base_passwd, - `br_shadow : `nss_base_shadow, - `br_group : `nss_base_group - ]; - UI::ChangeWidget (`id(br2entry[result]:nil), `Value, dn); + UI::ChangeWidget (`id(`base_config_dn), `Value, dn); } } if (result == `sssd_with_krb) @@ -1189,24 +1146,6 @@ UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); } - if (result == `br_tls_cacertdir) - { - string dir = UI::AskForExistingDirectory (tls_cacertdir, _("Choose the directory with certificates")); - if (dir != nil) - { - tls_cacertdir = dir; - UI::ChangeWidget (`id (`tls_cacertdir), `Value, dir); - } - } - if (result == `br_tls_cacertfile) - { - string file = UI::AskForExistingFile (tls_cacertfile, "*.pem *.crt", _("Choose the certificate file")); - if (file != nil) - { - tls_cacertfile = file; - UI::ChangeWidget (`id (`tls_cacertfile), `Value, file); - } - } if (result == `add) { string suffix = base_dn; @@ -1371,11 +1310,6 @@ Ldap::member_attribute != member_attribute || Ldap::create_ldap != create_ldap || Ldap::pam_password != pam_password || - Ldap::nss_base_passwd != nss_base_passwd || - Ldap::nss_base_group != nss_base_group || - Ldap::nss_base_shadow != nss_base_shadow || - Ldap::tls_cacertdir != tls_cacertdir || - Ldap::tls_cacertfile != tls_cacertfile || Ldap::krb5_realm != krb5_realm || Ldap::krb5_kdcip != krb5_kdcip || Ldap::sssd_cache_credentials != sssd_cache_credentials || @@ -1389,11 +1323,6 @@ Ldap::member_attribute = member_attribute; Ldap::create_ldap = create_ldap; Ldap::pam_password = pam_password; - Ldap::nss_base_passwd = nss_base_passwd; - Ldap::nss_base_group = nss_base_group; - Ldap::nss_base_shadow = nss_base_shadow; - Ldap::tls_cacertdir = tls_cacertdir; - Ldap::tls_cacertfile = tls_cacertfile; Ldap::krb5_realm = krb5_realm; Ldap::krb5_kdcip = krb5_kdcip; Ldap::sssd_with_krb = sssd_with_krb; Modified: trunk/ldap-client/testsuite/tests/LDAPInit.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAP… ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.out (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.out Thu Feb 2 15:08:40 2012 @@ -1,10 +1,10 @@ Dump ==== init (one server, no port set) ============== Dump ==== value of server: "localhost" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"yes"] true Return Dump ==== init (one server, nonsence port set) ======== Dump ==== value of server: "localhost:sdgfd#$" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"yes"] true Return Dump ==== init (more servers set, TLS used) =========== Dump ==== value of server: "chimera.suse.cz:333 localhost" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67350 - /trunk/iscsi-client/src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 12:14:24 2012 New Revision: 67350 URL: http://svn.opensuse.org/viewcvs/yast?rev=67350&view=rev Log: debug output Modified: trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 12:14:24 2012 @@ -381,7 +381,7 @@ } ret = writeInitiatorName(initiatorname); } else { - y2internal("initiatorname=%1", initiatorname); + y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67349 - /trunk/autoinstallation/doc/xml/Makefile.am
by ug＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: ug Date: Thu Feb 2 11:55:14 2012 New Revision: 67349 URL: http://svn.opensuse.org/viewcvs/yast?rev=67349&view=rev Log: typo Modified: trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefil… ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Thu Feb 2 11:55:14 2012 @@ -52,7 +52,6 @@ #pdf: # daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color # mkdir -p pdf -# echo "$(PDF_FILE) xxx" # cp -a $(PDF_FILE) pdf pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67348 - in /trunk/autoinstallation: autoyast2.spec.in doc/Makefile.am doc/xml/Makefile.am
by ug＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: ug Date: Thu Feb 2 11:54:14 2012 New Revision: 67348 URL: http://svn.opensuse.org/viewcvs/yast?rev=67348&view=rev Log: fixed the docu build, deactivated pdf build ... holy cow Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/doc/Makefile.am trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Thu Feb 2 11:54:14 2012 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL-2.0+ -BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp +BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp daps python-xml # API for Disabled Modules (ProductControl) BuildRequires: yast2 >= 2.16.36 # After API cleanup Modified: trunk/autoinstallation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am… ============================================================================== --- trunk/autoinstallation/doc/Makefile.am (original) +++ trunk/autoinstallation/doc/Makefile.am Thu Feb 2 11:54:14 2012 @@ -4,24 +4,25 @@ # $Id$ # -#SUBDIRS = xml +SUBDIRS = xml entities bin examples #htmldir = $(docdir)/html +EXTRA_DIST = ENV* -html_DATA = html -doc_DATA = pdf +#html_DATA = html +#doc_DATA = pdf -html: - $(MAKE) -C xml html +#html: +# $(MAKE) -C xml html -pdf: - $(MAKE) -C xml pdf +#pdf: +# $(MAKE) -C xml pdf pkgsrc: $(MAKE) -C xml pkgsrc -html-debug: - $(MAKE) -C xml pkgsrc +#html-debug: +# $(MAKE) -C xml pkgsrc bigfile: $(MAKE) -C xml ay_bigfile.xml Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefil… ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Thu Feb 2 11:54:14 2012 @@ -4,7 +4,7 @@ # $Id: Makefile.am 63765 2011-04-11 15:40:31Z ug $ # -SUBDIRS = images +SUBDIRS = images entities htmldir = $(docdir)/html xml_file = autoyast.xml @@ -22,8 +22,8 @@ STYLESHEET_CSS = default.css -html_DATA = html -doc_DATA = pdf +#html_DATA = html +#doc_DATA = pdf DAPS_BASE := $(shell readlink -f ..) @@ -35,21 +35,25 @@ #doc_DATA = autoyast.pdf -.PHONY: pdf html pkgsrc html-debug entities +#.PHONY: pdf html pkgsrc html-debug entities +.PHONY: html pkgsrc html-debug entities html: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) +html: RESULTDIR="..//build/autoyast/html/autoyast" +#html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) html: daps -e ENV-autoyast --basedir=$(DAPS_BASE) html --static rm -rf html && mkdir -p html cp -a $(RESULTDIR)/* html -pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) -pdf: - daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color - mkdir -p pdf - cp -a $(PDF_FILE) pdf +#pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml +#pdf: PDF_FILE="..//build/autoyast/autoyast_en.pdf" +#pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +#pdf: +# daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color +# mkdir -p pdf +# echo "$(PDF_FILE) xxx" +# cp -a $(PDF_FILE) pdf pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml daps -e ENV-autoyast --basedir=$(DAPS_BASE) package-src @@ -77,7 +81,6 @@ # was: images/PNG/*.png prep-daps-images: mkdir -p ../images/src/png - cp -axu ../autoyast2/img/*.png ../images/src/png ay_bigfile_docbook.xml: autoyast.xml $(xml_files) prep-daps-images entities # Remove internal entity statements @@ -102,14 +105,16 @@ ay_bigfile.xml: ay_bigfile_docbook.xml xsltproc --output $@ \ - /usr/share/susedoc/xslt/misc/db2novdoc.xsl $< + /usr/share/daps/xslt/misc/db2novdoc.xsl $< -install-data-local: html pdf -install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +#install-data-local: html pdf +install-data-local: html +#install-data-local: PDF_FILE="..//build/autoyast/autoyast_en.pdf" +#install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) install-data-local: install -d -m 755 $(DESTDIR)$(htmldir) cp -a $(srcdir)/html/* $(DESTDIR)$(htmldir) - cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) +# cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) # cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/img $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/devel $(DESTDIR)$(htmldir) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67347 - /tags/branch-Linux-12_1-2_21_13/ldap-client/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:44:06 2012 New Revision: 67347 URL: http://svn.opensuse.org/viewcvs/yast?rev=67347&view=rev Log: Created tag branch-Linux-12_1-2_21_13 for ldap-client Added: tags/branch-Linux-12_1-2_21_13/ldap-client/ - copied from r67346, branches/SuSE-Linux-12_1-Branch/ldap-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67346 - /tags/branch-Linux-12_1-2_21_13/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:43:50 2012 New Revision: 67346 URL: http://svn.opensuse.org/viewcvs/yast?rev=67346&view=rev Log: Created tag branch-Linux-12_1-2_21_13 Added: tags/branch-Linux-12_1-2_21_13/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67345 - /tags/branch-Linux-12_1-2_21_6/kerberos-client/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:33:55 2012 New Revision: 67345 URL: http://svn.opensuse.org/viewcvs/yast?rev=67345&view=rev Log: Created tag branch-Linux-12_1-2_21_6 for kerberos-client Added: tags/branch-Linux-12_1-2_21_6/kerberos-client/ - copied from r67344, branches/SuSE-Linux-12_1-Branch/kerberos-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67344 - in /branches/SuSE-Linux-12_1-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:33:39 2012 New Revision: 67344 URL: http://svn.opensuse.org/viewcvs/yast?rev=67344&view=rev Log: - change mode of sssd.conf file after writing (workaround for ini-agent bnc#743355) - 2.21.13 Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-c… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/VERSION Thu Feb 2 09:33:39 2012 @@ -1 +1 @@ -2.21.12 +2.21.13 Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-c… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/package/yast2-ldap-client.changes Thu Feb 2 09:33:39 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 2 09:01:47 CET 2012 - jsuchome(a)suse.cz + +- change mode of sssd.conf file after writing (workaround for + ini-agent bnc#743355) +- 2.21.13 + +------------------------------------------------------------------- Wed Nov 16 15:31:30 CET 2011 - jsuchome(a)suse.cz - correctly handle sssd config with more LDAP servers (bnc#729174) Modified: branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/ldap-c… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Linux-12_1-Branch/ldap-client/src/Ldap.ycp Thu Feb 2 09:33:39 2012 @@ -2213,9 +2213,10 @@ */ global boolean WriteSSSDConfig () { - if (!FileUtils::Exists ("/etc/sssd/sssd.conf")) + string file = "/etc/sssd/sssd.conf"; + if (!FileUtils::Exists (file)) { - y2warning ("file /etc/sssd/sssd.conf does not exists: not writing"); + y2warning ("file %1 does not exists: not writing", file); return false; } @@ -2278,8 +2279,13 @@ if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing ldap.conf file"); + y2error ("error writing %1 file", file); } + else + { + // workadound for ini-agent bug (bnc#743355) + SCR::Execute (.target.bash, sformat ("/bin/chmod 600 %1", file)); + } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67343 - /tags/branch-Linux-12_1-2_21_6/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:33:38 2012 New Revision: 67343 URL: http://svn.opensuse.org/viewcvs/yast?rev=67343&view=rev Log: Created tag branch-Linux-12_1-2_21_6 Added: tags/branch-Linux-12_1-2_21_6/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67342 - in /branches/SuSE-Linux-12_1-Branch/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 09:27:34 2012 New Revision: 67342 URL: http://svn.opensuse.org/viewcvs/yast?rev=67342&view=rev Log: - change mode of sssd.conf file after writing (workaround for ini-agent bnc#743355) - 2.21.6 Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/kerber… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION (original) +++ branches/SuSE-Linux-12_1-Branch/kerberos-client/VERSION Thu Feb 2 09:27:34 2012 @@ -1 +1 @@ -2.21.5 +2.21.6 Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/kerber… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes (original) +++ branches/SuSE-Linux-12_1-Branch/kerberos-client/package/yast2-kerberos-client.changes Thu Feb 2 09:27:34 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 2 09:02:01 CET 2012 - jsuchome(a)suse.cz + +- change mode of sssd.conf file after writing (workaround for + ini-agent bnc#743355) +- 2.21.6 + +------------------------------------------------------------------- Wed Nov 16 15:44:20 CET 2011 - jsuchome(a)suse.cz - correctly handle sssd config with more LDAP servers (bnc#729174) Modified: branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-12_1-Branch/kerber… ============================================================================== --- branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp (original) +++ branches/SuSE-Linux-12_1-Branch/kerberos-client/src/Kerberos.ycp Thu Feb 2 09:27:34 2012 @@ -508,8 +508,13 @@ SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing ldap.conf file"); + y2error ("error writing sssd.conf file"); } + else + { + // workadound for ini-agent bug (bnc#743355) + SCR::Execute (.target.bash, "/bin/chmod 600 /etc/sssd/sssd.conf"); + } } else if (use_pam_krb) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67341 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: fehr Date: Wed Feb 1 19:31:58 2012 New Revision: 67341 URL: http://svn.opensuse.org/viewcvs/yast?rev=67341&view=rev Log: create /etc/iscsi to prevent crash if nonexistant (bnc#742570) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 1 19:31:58 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +- create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) ------------------------------------------------------------------- Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Wed Feb 1 19:31:58 2012 @@ -321,6 +321,12 @@ global boolean writeInitiatorName(string new_value){ boolean ret=true; string file="/etc/iscsi/initiatorname.iscsi"; + string dir="/etc/iscsi"; + if( (map)SCR::Read (.target.stat, dir )==$[] ) + { + SCR::Execute(.target.mkdir, dir ); + y2milestone( "writeInitiatorName dir:%1", SCR::Read(.target.stat, dir )); + } if ( ((map<string, any>)SCR::Read (.target.lstat, file))["size"]:0>0 ) { y2milestone("%1 file exists, create backup", file); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67340 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: fehr Date: Wed Feb 1 19:30:22 2012 New Revision: 67340 URL: http://svn.opensuse.org/viewcvs/yast?rev=67340&view=rev Log: create /etc/iscsi to prevent crash if nonexistant (bnc#742570) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 1 19:30:22 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +- create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Wed Feb 1 19:30:22 2012 @@ -321,6 +321,12 @@ global boolean writeInitiatorName(string new_value){ boolean ret=true; string file="/etc/iscsi/initiatorname.iscsi"; + string dir="/etc/iscsi"; + if( (map)SCR::Read (.target.stat, dir )==$[] ) + { + SCR::Execute(.target.mkdir, dir ); + y2milestone( "writeInitiatorName dir:%1", SCR::Read(.target.stat, dir )); + } if ( ((map<string, any>)SCR::Read (.target.lstat, file))["size"]:0>0 ) { y2milestone("%1 file exists, create backup", file); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67339 - in /trunk/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: ug Date: Wed Feb 1 16:28:28 2012 New Revision: 67339 URL: http://svn.opensuse.org/viewcvs/yast?rev=67339&view=rev Log: 2.22.0 Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=673… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Feb 1 16:28:28 2012 @@ -1 +1 @@ -2.21.4 +2.22.0 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Feb 1 16:28:28 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 1 16:28:04 CET 2012 - ug(a)suse.de + +- 2.22.0 + +------------------------------------------------------------------- Wed Jan 4 15:51:41 CET 2012 - ug(a)suse.de - added taboo list for device guessing -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67338 - in /trunk/ncurses/src: NCRichText.cc NCRichText.h
by gs＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: gs Date: Wed Feb 1 13:23:51 2012 New Revision: 67338 URL: http://svn.opensuse.org/viewcvs/yast?rev=67338&view=rev Log: ignore <tt> tag, interpret html tags inside <pre> (bnc #724119) Modified: trunk/ncurses/src/NCRichText.cc trunk/ncurses/src/NCRichText.h Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Wed Feb 1 13:23:51 2012 @@ -344,36 +344,32 @@ } } - -void NCRichText::PadPlainTXT( const wchar_t * osch, const unsigned olen ) +void NCRichText::PadPreTXT( const wchar_t * osch, const unsigned olen ) { wstring wtxt( osch, olen ); + // resolve the entities even in PRE (#71718) wtxt = filterEntities( wtxt ); - + NCstring nctxt( wtxt ); NCtext ftext( nctxt ); - if ( ftext.Columns() > textwidth ) - textwidth = ftext.Columns(); - - AdjustPad( wsze( cl + ftext.Lines(), textwidth ) ); + int len = textWidth( wtxt ); + if ( cc + len > textwidth ) + { + textwidth = cc + len; + AdjustPad( wsze(cl+ftext.Lines(), textwidth) ); + } + // insert the text const wchar_t * sch = wtxt.data(); while ( *sch ) { - if ( *sch != L'\r' ) // skip carriage return - { - myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth( *sch ); + myPad()->addwstr( sch, 1 ); // add one wide chararacter + cc += wcwidth( *sch ); - if ( *sch == L'\n' ) - { - PadNL(); // add a new line - } - } ++sch; } } @@ -420,17 +416,16 @@ while ( *wch && WDtoken.find( *wch ) == wstring::npos ); } +static wstring PREtoken( L"<\n\v\r" ); // line manipulations + TokenStart '<' + inline void SkipPreTXT( const wchar_t *& wch ) { - wstring wstr( wch, 6 ); - do { ++wch; - wstr.assign( wch, 6 ); } - while ( *wch && wstr != L"</pre>" ); + while ( *wch && PREtoken.find( *wch ) == wstring::npos ); } @@ -483,16 +478,14 @@ break; case L'<': - if ( !preTag ) - { - swch = wch; - SkipToken( wch ); + swch = wch; + SkipToken( wch ); + + if ( PadTOKEN( swch, wch ) ) + break; // strip token + else + wch = swch; // reset and fall through - if ( PadTOKEN( swch, wch ) ) - break; // strip token - else - wch = swch; // reset and fall through - } default: swch = wch; @@ -504,9 +497,7 @@ else { SkipPreTXT( wch ); - PadPlainTXT( swch, wch - swch ); - preTag = false; - PadNL(); // add new line after pre is closed + PadPreTXT( swch, wch - swch ); } break; @@ -515,6 +506,7 @@ PadBOL(); AdjustPad( wsze( cl, textwidth ) ); + yuiMilestone() << "adjust: lines: " << cl << " columns: " << textwidth << endl; yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -841,7 +833,7 @@ else if ( value == L"li" ) token = T_LI; else if ( value == L"ol" ) { token = T_LEVEL; leveltag = 1; } else if ( value == L"qt" ) token = T_IGNORE; - else if ( value == L"tt" ) token = T_TT; + else if ( value == L"tt" ) token = T_IGNORE; else if ( value == L"ul" ) { token = T_LEVEL; leveltag = 0; } break; @@ -981,11 +973,12 @@ if ( !endtag ) { - preTag = true; // display plain text + preTag = true; // display text preserving newlines and spaces } else { preTag = false; + PadNL(); // add new line after pre } break; Modified: trunk/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.h?rev=673… ============================================================================== --- trunk/ncurses/src/NCRichText.h (original) +++ trunk/ncurses/src/NCRichText.h Wed Feb 1 13:23:51 2012 @@ -91,8 +91,7 @@ unsigned cindent; bool atbol; - bool preTag; // default is false; set true - // if <pre> tag is found + bool preTag; // <pre> tag unsigned Tattr; @@ -212,7 +211,7 @@ void PadBOL(); void PadWS( const bool tab = false ); void PadTXT( const wchar_t * sch, const unsigned len ); - void PadPlainTXT( const wchar_t * sch, const unsigned len ); + void PadPreTXT( const wchar_t * sch, const unsigned len ); bool PadTOKEN( const wchar_t * sch, const wchar_t *& ech ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67337 - in /branches/SuSE-Code-11-SP1-Branch/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp src/modules/Bootloader.ycp src/routines/misc.ycp
by snwint＠svn2.opensuse.org 01 Feb '12

01 Feb '12

Author: snwint Date: Wed Feb 1 11:48:50 2012 New Revision: 67337 URL: http://svn.opensuse.org/viewcvs/yast?rev=67337&view=rev Log: - fix default menu entry detection in zipl.conf (bnc #740324) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/VERSION Wed Feb 1 11:48:50 2012 @@ -1 +1 @@ -2.17.85 +2.17.86 Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/package/yast2-bootloader.changes Wed Feb 1 11:48:50 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 27 14:58:43 CET 2012 - snwint(a)suse.de + +- fix default menu entry detection (bnc #740324) +- 2.17.86 + +------------------------------------------------------------------- Fri Jan 13 15:48:55 CET 2012 - snwint(a)suse.de - really update bootloader sections after device renaming (bnc #727310) Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/BootCommon.ycp Wed Feb 1 11:48:50 2012 @@ -440,6 +440,8 @@ global string addMDSettingsToGlobals (); global boolean VerifyMDArray (); +// zipl.conf has its own idiosyncrasies when it comes to default entries +global string checkZiplDefault (string def); // // FIXME: the select and selectdevice seem to be broken: the default value of @@ -1555,6 +1557,69 @@ return ret; } +/** bnc #364904 + * Function parse zipl list names if default section is menu + * + * @param string (string) list of names + * @param string position of default name in list + * @return string name of default section from list + */ +string parseListDefault(string names, string position) +{ + string ret = ""; + + y2milestone("section names (string) list: %1 and default name position in list: %2", names, position); + if ((names == "") || (position == "")) + return ret; + + if (search(names, ",") != nil) + { + string tmp_names = deletechars(names, " "); + list <string> list_names = splitstring(tmp_names, ","); + ret = list_names[(tointeger(position)-1)]:""; + } else { + ret = names; + } + + return ret; +} + +/** bnc #364904 + * Function check if default section is menu + * if yes it tries to find default section in + * list of names from menu section + * + * @param string name of default BootCommon::globals["default"]:"" + * @return string name of default section + */ + +global string checkZiplDefault(string def) +{ + string def_section_name = def; + + if (getLoaderType (false) == "zipl") + { + foreach(map<string,any> section, BootCommon::sections, + { + if (section["name"]:"" == def_section_name) + { + if (section["type"]:"" == "menu") + { + string def_position = section["default"]:""; + def_section_name = parseListDefault(section["list"]:"", def_position); + + } else { + break; + } + } + }); + + } + + y2milestone("name of default section: %1", def_section_name); + return def_section_name; +} + } /* Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/modules/Bootloader.ycp Wed Feb 1 11:48:50 2012 @@ -1035,76 +1035,13 @@ y2milestone("sections after remapping: %1", BootCommon::sections); } -/** bnc #364904 - * Function parse zipl list names if default section is menu - * - * @param string (string) list of names - * @param string position of default name in list - * @return string name of default section from list - */ -string parseListDefault(string names, string position) -{ - string ret = ""; - - y2milestone("section names (string) list: %1 and default name position in list: %2", names, position); - if ((names == "") || (position == "")) - return ret; - - if (search(names, ",") != nil) - { - string tmp_names = deletechars(names, " "); - list <string> list_names = splitstring(tmp_names, ","); - ret = list_names[(tointeger(position)-1)]:""; - } else { - ret = names; - } - - return ret; -} - -/** bnc #364904 - * Function check if default section is menu - * if yes it tries to find default section in - * list of names from menu section - * - * @param string name of default BootCommon::globals["default"]:"" - * @return string name of default section - */ - -string checkZiplDefault(string def) -{ - string def_section_name = def; - - if (getLoaderType () == "zipl") - { - foreach(map<string,any> section, BootCommon::sections, - { - if (section["name"]:"" == def_section_name) - { - if (section["type"]:"" == "menu") - { - string def_position = section["default"]:""; - def_section_name = parseListDefault(section["list"]:"", def_position); - - } else { - break; - } - } - }); - - } - - y2milestone("name of default section: %1", def_section_name); - return def_section_name; -} - /** * return default section label * @return string default section label */ global define string getDefaultSection () { ReadOrProposeIfNeeded (); - string default_name = checkZiplDefault(BootCommon::globals["default"]:""); + string default_name = BootCommon::checkZiplDefault(BootCommon::globals["default"]:""); return default_name; } Modified: branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/bootl… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/bootloader/src/routines/misc.ycp Wed Feb 1 11:48:50 2012 @@ -2431,10 +2431,11 @@ // fix for bnc #440125 - default boot section with failsafe args // it is not possible create exact algoritmus but I hope it helps in // mostly cases. - if (isDefaultBootSectioLinux(BootCommon::globals["default"]:"")) - default_boot_section_name = BootCommon::globals["default"]:""; - else + default_boot_section_name = BootCommon::checkZiplDefault(BootCommon::globals["default"]:""); + if (!isDefaultBootSectioLinux(default_boot_section_name)) + { default_boot_section_name = findRelativeDefaultLinux (); + } // get the default and failsafe append + vga parameters; if section with // appropriate original name not found, just use any Linux section -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0