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