December 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66981 - /tags/stable-2_22_0/core/
by lslezak＠svn2.opensuse.org 02 Dec '11

02 Dec '11

Author: lslezak Date: Fri Dec 2 13:11:38 2011 New Revision: 66981 URL: http://svn.opensuse.org/viewcvs/yast?rev=66981&view=rev Log: Created tag stable-2_22_0 for core Added: tags/stable-2_22_0/core/ (props changed) - copied from r66980, trunk/core/ -- 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] r66980 - /trunk/core/agent-process/testsuite/tests/stdout.ycp
by lslezak＠svn2.opensuse.org 02 Dec '11

02 Dec '11

Author: lslezak Date: Fri Dec 2 13:08:50 2011 New Revision: 66980 URL: http://svn.opensuse.org/viewcvs/yast?rev=66980&view=rev Log: process-agent testsuite - use the defined variable instead of the literal string Modified: trunk/core/agent-process/testsuite/tests/stdout.ycp Modified: trunk/core/agent-process/testsuite/tests/stdout.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/stdout.ycp (original) +++ trunk/core/agent-process/testsuite/tests/stdout.ycp Fri Dec 2 13:08:50 2011 @@ -22,7 +22,7 @@ } string in2 = "foo2\nfoo2\n"; - SCR::Write(., id, "foo2\nfoo2\n"); + SCR::Write(., id, in2); // read "foo2\nfoo2\n" string out3 = ""; -- 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] r66979 - in /trunk/core: agent-process/testsuite/tests/stderr.ycp agent-process/testsuite/tests/stdout.ycp package/yast2-core.changes
by lslezak＠svn2.opensuse.org 02 Dec '11

02 Dec '11

Author: lslezak Date: Fri Dec 2 13:07:16 2011 New Revision: 66979 URL: http://svn.opensuse.org/viewcvs/yast?rev=66979&view=rev Log: - process-agent - fixed testuite (removed potential race condition) - 2.22.0 Modified: trunk/core/agent-process/testsuite/tests/stderr.ycp trunk/core/agent-process/testsuite/tests/stdout.ycp trunk/core/package/yast2-core.changes Modified: trunk/core/agent-process/testsuite/tests/stderr.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/stderr.ycp (original) +++ trunk/core/agent-process/testsuite/tests/stderr.ycp Fri Dec 2 13:07:16 2011 @@ -7,15 +7,32 @@ // no output string out1 = (string)SCR::Read(.read_stderr, id); - SCR::Write(., id, "foo\n"); - sleep(250); + string in1 = "foo\n"; + SCR::Write(., id, in1); // read "foo\n" - string out2 = (string)SCR::Read(.read_stderr, id); + string out2 = ""; + while (out2 != in1) + { + string o = (string)SCR::Read(.read_stderr, id); + if (o != nil) + { + out2 = out2 + o; + } + } + + string in2 = "foo2\nfoo2\n"; + SCR::Write(., id, in2); - SCR::Write(., id, "foo2\nfoo2\n"); - sleep(250); // read "foo2\nfoo2\n" - string out3 = (string)SCR::Read(.read_stderr, id); + string out3 = ""; + while (out3 != in2) + { + string o = (string)SCR::Read(.read_stderr, id); + if (o != nil) + { + out3 = out3 + o; + } + } // no output string out4 = (string)SCR::Read(.read_stderr, id); @@ -35,22 +52,32 @@ string out1 = (string)SCR::Read(.read_line_stderr, id); SCR::Write(., id, "foo\n"); - sleep(250); // read "foo\n" - string out2 = (string)SCR::Read(.read_line_stderr, id); + string out2 = nil; + while (out2 == nil) + { + out2 = (string)SCR::Read(.read_line_stderr, id); + } SCR::Write(., id, "foo2\nfoo2\n"); - sleep(250); + // read "foo2\n" - string out3 = (string)SCR::Read(.read_line_stderr, id); + string out3 = nil; + while (out3 == nil) + { + out3 = (string)SCR::Read(.read_line_stderr, id); + } // read "foo2\n" - string out4 = (string)SCR::Read(.read_line_stderr, id); + string out4 = nil; + while (out4 == nil) + { + out4 = (string)SCR::Read(.read_line_stderr, id); + } // no output string out5 = (string)SCR::Read(.read_line_stderr, id); - // close the communication channel SCR::Execute(.close, id); while(SCR::Read(.running, id) == true) sleep(20); Modified: trunk/core/agent-process/testsuite/tests/stdout.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-process/testsuite/tes… ============================================================================== --- trunk/core/agent-process/testsuite/tests/stdout.ycp (original) +++ trunk/core/agent-process/testsuite/tests/stdout.ycp Fri Dec 2 13:07:16 2011 @@ -7,15 +7,33 @@ // no output string out1 = (string)SCR::Read(.read, id); - SCR::Write(., id, "foo\n"); - sleep(250); + string in1 = "foo\n"; + SCR::Write(., id, in1); + // read "foo\n" - string out2 = (string)SCR::Read(.read, id); + string out2 = ""; + while (out2 != in1) + { + string o = (string)SCR::Read(.read, id); + if (o != nil) + { + out2 = out2 + o; + } + } + string in2 = "foo2\nfoo2\n"; SCR::Write(., id, "foo2\nfoo2\n"); - sleep(250); + // read "foo2\nfoo2\n" - string out3 = (string)SCR::Read(.read, id); + string out3 = ""; + while (out3 != in2) + { + string o = (string)SCR::Read(.read, id); + if (o != nil) + { + out3 = out3 + o; + } + } // no output string out4 = (string)SCR::Read(.read, id); @@ -34,22 +52,33 @@ string out1 = (string)SCR::Read(.read_line, id); SCR::Write(., id, "foo\n"); - sleep(250); + // read "foo\n" - string out2 = (string)SCR::Read(.read_line, id); + string out2 = nil; + while (out2 == nil) + { + out2 = (string)SCR::Read(.read_line, id); + } SCR::Write(., id, "foo2\nfoo2\n"); - sleep(250); + // read "foo2\n" - string out3 = (string)SCR::Read(.read_line, id); + string out3 = nil; + while (out3 == nil) + { + out3 = (string)SCR::Read(.read_line, id); + } // read "foo2\n" - string out4 = (string)SCR::Read(.read_line, id); + string out4 = nil; + while (out4 == nil) + { + out4 = (string)SCR::Read(.read_line, id); + } // no output string out5 = (string)SCR::Read(.read_line, id); - // close the communication channel SCR::Execute(.close, id); while(SCR::Read(.running, id) == true) sleep(20); 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 Dec 2 13:07:16 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 2 11:49:56 UTC 2011 - lslezak(a)suse.cz + +- process-agent - fixed testuite (removed potential race condition) +- 2.22.0 + +------------------------------------------------------------------- Fri Nov 25 14:11:01 CET 2011 - mvidner(a)suse.cz - ini-agent: Fixed a test failure "wrong stderr for nonex" -- 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] r66978 - in /branches/SuSE-Code-11-SP2-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQRichText.cc src/YQRichText.h
by tgoettlicher＠svn2.opensuse.org 01 Dec '11

01 Dec '11

Author: tgoettlicher Date: Thu Dec 1 17:53:25 2011 New Revision: 66978 URL: http://svn.opensuse.org/viewcvs/yast?rev=66978&view=rev Log: - Follow links to anchors in YQTextBrowser (bnc #727330) 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/YQRichText.cc branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.h 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 Dec 1 17:53:25 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") 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 Dec 1 17:53:25 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 1 17:52:42 CET 2011 - tgoettlicher(a)suse.de + +- Follow links to anchors in YQTextBrowser (bnc #727330) +- V 2.21.5 + +------------------------------------------------------------------- Wed May 18 17:04:43 CEST 2011 - tgoettlicher(a)suse.de - Fixed selection in tree widgets (bnc #680107) Modified: branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.cc Thu Dec 1 17:53:25 2011 @@ -236,5 +236,16 @@ } +void YQTextBrowser::setSource( const QUrl & name ) +{ + // scroll to link if it's available in the current document + // but prevent loading empty pages + + if ( name.toString().startsWith("#") ) + scrollToAnchor( name.toString().mid(1) ); + +} + + #include "YQRichText.moc" Modified: branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.h (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/src/YQRichText.h Thu Dec 1 17:53:25 2011 @@ -189,7 +189,7 @@ * Reimplemented from QTextBrowser to avoid having an empty text each time * the user clicks on a hyperlink. **/ - virtual void setSource( const QUrl & name ) {} + virtual void setSource( const QUrl & name ); }; -- 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] r66977 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQRichText.cc src/YQRichText.h
by tgoettlicher＠svn2.opensuse.org 01 Dec '11

01 Dec '11

Author: tgoettlicher Date: Thu Dec 1 17:49:14 2011 New Revision: 66977 URL: http://svn.opensuse.org/viewcvs/yast?rev=66977&view=rev Log: Follow links to anchors in YQTextBrowser (bnc #727330) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQRichText.cc trunk/qt/src/YQRichText.h Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=66977&r1=66… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu Dec 1 17:49:14 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "21") -SET(VERSION_PATCH "7") +SET(VERSION_MINOR "22") +SET(VERSION_PATCH "0") 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 Dec 1 17:49:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 1 17:46:33 CET 2011 - tgoettlicher(a)suse.de + +- Follow links to anchors in YQTextBrowser (bnc #727330) +- V 2.22.0 + +------------------------------------------------------------------- Tue Oct 4 10:25:15 CEST 2011 - tgoettlicher(a)suse.de - Don't overwrite wizard's dialog title Modified: trunk/qt/src/YQRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.cc?rev=66977&r… ============================================================================== --- trunk/qt/src/YQRichText.cc (original) +++ trunk/qt/src/YQRichText.cc Thu Dec 1 17:49:14 2011 @@ -235,6 +235,16 @@ return true; } +void YQTextBrowser::setSource( const QUrl & name ) +{ + // scroll to link if it's available in the current document + // but prevent loading empty pages + + if ( name.toString().startsWith("#") ) + scrollToAnchor( name.toString().mid(1) ); + +} + #include "YQRichText.moc" Modified: trunk/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQRichText.h?rev=66977&r1… ============================================================================== --- trunk/qt/src/YQRichText.h (original) +++ trunk/qt/src/YQRichText.h Thu Dec 1 17:49:14 2011 @@ -189,7 +189,7 @@ * Reimplemented from QTextBrowser to avoid having an empty text each time * the user clicks on a hyperlink. **/ - virtual void setSource( const QUrl & name ) {} + virtual void setSource( const QUrl & name ); }; -- 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] r66976 - /trunk/core/libycp/src/pathsearch.cc
by aschnell＠svn2.opensuse.org 01 Dec '11

01 Dec '11

Author: aschnell Date: Thu Dec 1 17:09:35 2011 New Revision: 66976 URL: http://svn.opensuse.org/viewcvs/yast?rev=66976&view=rev Log: - shorted code by using standard functions Modified: trunk/core/libycp/src/pathsearch.cc Modified: trunk/core/libycp/src/pathsearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/pathsearch.cc?re… ============================================================================== --- trunk/core/libycp/src/pathsearch.cc (original) +++ trunk/core/libycp/src/pathsearch.cc Thu Dec 1 17:09:35 2011 @@ -128,32 +128,10 @@ } -// globsubst ("YaST::Foo::UI", "::", "/") == "YaST/Foo/UI" -string Y2PathSearch::globsubst (const string& where, - const string& oldstr, const string& newstr) -{ - string ret; - string::size_type olen = oldstr.length (); - string::size_type p = 0, q; // interval between occurences of oldstr - for (;;) - { - q = where.find (oldstr, p); // find oldstr - ret.append (where, p, q - p); // copy what is before it - if (q == string::npos) - { - break; - } - ret.append (newstr); - p = q + olen; - } - return ret; -} - - string Y2PathSearch::completeFilename (const string& fname) { - string slashes = globsubst (fname, "::", "/"); + string slashes = boost::replace_all_copy(fname, "::", "/"); char* cfn = canonicalize_file_name (slashes.c_str ()); string ret = cfn ? string (cfn) : fname; free (cfn); @@ -353,9 +331,8 @@ string YCPPathSearch::findModule (string name, bool the_source) { - // TODO: more efficiently, do not search the whole string# string extension = (the_source ? ".ycp" : ".ybc"); - if (name.rfind (extension) == string::npos) + if (!boost::ends_with(name, extension)) { name += extension; } @@ -366,16 +343,9 @@ void YCPPathSearch::addPath (Kind kind, const string& path) { - std::list<std::string>::iterator it = searchList[kind].begin(); - while (it != searchList[kind].end()) - { - if (*it == path) - { - return; // already in list, drop duplicate - } - it++; - } - searchList[kind].push_front (path); + std::list<string>& l = searchList[kind]; + if (std::find(l.begin(), l.end(), path) == l.end()) + l.push_front(path); } -- 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] r66975 - /trunk/core/VERSION
by aschnell＠svn2.opensuse.org 01 Dec '11

01 Dec '11

Author: aschnell Date: Thu Dec 1 17:08:05 2011 New Revision: 66975 URL: http://svn.opensuse.org/viewcvs/yast?rev=66975&view=rev Log: - increased version Modified: trunk/core/VERSION Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=66975&r1=66974&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Thu Dec 1 17:08:05 2011 @@ -1 +1 @@ -2.21.8 +2.22.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] r66974 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 01 Dec '11

01 Dec '11

Author: gs Date: Thu Dec 1 14:19:38 2011 New Revision: 66974 URL: http://svn.opensuse.org/viewcvs/yast?rev=66974&view=rev Log: error popup: added more information about failure Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Dec 1 14:19:38 2011 @@ -85,7 +85,9 @@ y2milestone( "Output: %1", output ); if ( output["exit"]:255 != 0 ) { - Popup::Error( sformat( _("Command %1 failed"), command ) ); + // text of an error popup + Popup::Error( sformat( _("Cannot remove the FCoE interface. +Command %1 failed."), command ) ); } } ); FcoeClient::ResetRevertCommands(); // important during installation -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0