Hello community, here is the log from the commit of package yast2-qt-pkg for openSUSE:Factory checked in at 2012-03-23 15:11:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-qt-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-qt-pkg", Maintainer is "TGoettlicher@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-qt-pkg/yast2-qt-pkg.changes 2012-03-22 12:42:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-qt-pkg.new/yast2-qt-pkg.changes 2012-03-23 15:12:00.000000000 +0100 @@ -1,0 +2,6 @@ +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 + +------------------------------------------------------------------- Old: ---- yast2-qt-pkg-2.21.21.tar.bz2 New: ---- yast2-qt-pkg-2.21.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt-pkg.spec ++++++ --- /var/tmp/diff_new_pack.PHRSsu/_old 2012-03-23 15:12:02.000000000 +0100 +++ /var/tmp/diff_new_pack.PHRSsu/_new 2012-03-23 15:12:02.000000000 +0100 @@ -18,11 +18,11 @@ Name: yast2-qt-pkg -Version: 2.21.21 +Version: 2.21.22 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-pkg-2.21.21.tar.bz2 +Source0: yast2-qt-pkg-2.21.22.tar.bz2 Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel ++++++ yast2-qt-pkg-2.21.21.tar.bz2 -> yast2-qt-pkg-2.21.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.21/VERSION.cmake new/yast2-qt-pkg-2.21.22/VERSION.cmake --- old/yast2-qt-pkg-2.21.21/VERSION.cmake 2012-03-21 14:31:22.000000000 +0100 +++ new/yast2-qt-pkg-2.21.22/VERSION.cmake 2012-03-23 11:07:10.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "21") +SET(VERSION_PATCH "22") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.21/package/yast2-qt-pkg.changes new/yast2-qt-pkg-2.21.22/package/yast2-qt-pkg.changes --- old/yast2-qt-pkg-2.21.21/package/yast2-qt-pkg.changes 2012-03-21 14:31:22.000000000 +0100 +++ new/yast2-qt-pkg-2.21.22/package/yast2-qt-pkg.changes 2012-03-23 11:07:10.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-pkg-2.21.21/src/YQPkgObjList.cc new/yast2-qt-pkg-2.21.22/src/YQPkgObjList.cc --- old/yast2-qt-pkg-2.21.21/src/YQPkgObjList.cc 2012-03-21 14:31:22.000000000 +0100 +++ new/yast2-qt-pkg-2.21.22/src/YQPkgObjList.cc 2012-03-23 11:07:10.000000000 +0100 @@ -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: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org