Author: tgoettlicher Date: Thu Apr 1 15:18:07 2010 New Revision: 61574 URL: http://svn.opensuse.org/viewcvs/yast?rev=61574&view=rev Log: - Fixed bnc #48761: yast doesn't respect locks - 2.18.21 Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPkgList.cc trunk/qt-pkg/src/YQPkgObjList.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=61574&r1=61573&r2=61574&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Apr 1 15:18:07 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "20") +SET(VERSION_PATCH "21") 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=61574&r1=61573&r2=61574&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Apr 1 15:18:07 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 1 15:14:47 CEST 2010 - tgoettlicher@suse.de + +- Fixed bnc #48761: yast doesn't respect locks +- 2.18.21 + +------------------------------------------------------------------- Thu Mar 18 13:59:34 CET 2010 - tgoettlicher@suse.de - Added libqt4 dependency (bnc #589104) Modified: trunk/qt-pkg/src/YQPkgList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgList.cc?rev=61574&r1=61573&r2=61574&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgList.cc (original) +++ trunk/qt-pkg/src/YQPkgList.cc Thu Apr 1 15:18:07 2010 @@ -721,7 +721,7 @@ if ( doChange ) { - if ( ! countOnly ) + if ( ! countOnly ) selectable->setStatus( newStatus ); changedCount++; Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=61574&r1=61573&r2=61574&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Thu Apr 1 15:18:07 2010 @@ -362,7 +362,7 @@ { if ( newStatus == S_Update ) { - if ( item->candidateIsNewer() || force ) + if ( ( item->candidateIsNewer() && item->status() != S_Protected ) || force ) item->setStatus( newStatus, false ); // sendSignals } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org