Author: sh-sh-sh Date: Tue Oct 7 15:08:50 2008 New Revision: 51920 URL: http://svn.opensuse.org/viewcvs/yast?rev=51920&view=rev Log: Fixed bnc #421267: Missing newline in exported conflicts list Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgConflictList.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=51920&r1=51919&r2=51920&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Tue Oct 7 15:08:50 2008 @@ -1,5 +1,5 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "8") +SET(VERSION_PATCH "9") # RELEASED: 2.17.6 Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.changes?rev=51920&r1=51919&r2=51920&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Tue Oct 7 15:08:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 7 15:04:28 CEST 2008 - sh@suse.de + +- Fixed bnc #421267: Missing newline in exported conflicts list +- V 2.17.9 + +------------------------------------------------------------------- Thu Oct 2 13:20:46 CEST 2008 - sh@suse.de - Fixed bnc #430392: Typo in error message @@ -9,7 +15,6 @@ - Fixed bnc #418279: export list to text file fails ------------------------------------------------------------------- ->>>>>>> .r51918 Fri Sep 26 16:53:35 CEST 2008 - kmachalkova@suse.cz - Fixed crash in Languages filter: redefined sort function for Modified: trunk/qt-pkg/src/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgConflictList.cc?rev=51920&r1=51919&r2=51920&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgConflictList.cc (original) +++ trunk/qt-pkg/src/YQPkgConflictList.cc Tue Oct 7 15:08:50 2008 @@ -195,6 +195,7 @@ file.write(header.toUtf8()); YQPkgConflict * conflict; + foreach( conflict, _conflicts ) { conflict->saveToFile( file ); @@ -373,8 +374,10 @@ zypp::ProblemSolution_Ptr solution = it.value(); buffer.sprintf( " [%c] %s\n", button->isChecked() ? 'x' : ' ', qPrintable( fromUTF8( solution->description() ) ) ); buffer += fromUTF8( solution->details() ); + buffer += "\n"; file.write(buffer.toUtf8()); } + file.write( "\n\n" ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org