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