Author: tgoettlicher Date: Fri Mar 23 11:05:56 2012 New Revision: 67693 URL: http://svn.opensuse.org/viewcvs/yast?rev=67693&view=rev Log: Fixed bnc#704123: When updating packages, same version numbers in different repositories confuse YaST (2.21.22) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes 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=67693&r1=67692&r2=67693&view=diff ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Fri Mar 23 11:05:56 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "21") +SET(VERSION_PATCH "22") 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=67693&r1=67692&r2=67693&view=diff ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Fri Mar 23 11:05:56 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 23 11:05:38 CET 2012 - tgoettlicher@suse.de + +- Fixed bnc#704123: When updating packages, same version numbers in different repositories confuse YaST +- Version: 2.21.22 + +------------------------------------------------------------------- Wed Mar 21 14:30:14 CET 2012 - tgoettlicher@suse.de - Added shortcut to conflict dialog Modified: trunk/qt-pkg/src/YQPkgObjList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgObjList.cc?rev=67693&r1=67692&r2=67693&view=diff ============================================================================== --- trunk/qt-pkg/src/YQPkgObjList.cc (original) +++ trunk/qt-pkg/src/YQPkgObjList.cc Fri Mar 23 11:05:56 2012 @@ -355,10 +355,19 @@ { if ( newStatus == S_Update ) { - if ( ( item->candidateIsNewer() && item->status() != S_Protected ) || force ) - item->setStatus( newStatus, - false ); // sendSignals - } + if ( force ) + { + item->setStatus( newStatus, + false ); // sendSignals + } + else + { + if ( item->selectable()->installedObj() && item->status() != S_Protected && item->selectable()->updateCandidateObj() ) + { + item->selectable()->setOnSystem( item->selectable()->updateCandidateObj() ); + } + } + } else { item->setStatus( newStatus, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org