Hello community,
here is the log from the commit of package yast2-qt
checked in at Fri Nov 24 16:20:57 CET 2006.
--------
--- yast2-qt/yast2-qt.changes 2006-11-21 12:07:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/STABLE/yast2-qt/yast2-qt.changes 2006-11-24 13:14:12.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 16:50:28 CET 2006 - sh@suse.de
+
+- Fixed bug #223416: Updated patches not visible in default view
+- V 2.14.3
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.14.2.tar.bz2
New:
----
yast2-qt-2.14.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.5mh4eR/_old 2006-11-24 16:19:04.000000000 +0100
+++ /var/tmp/diff_new_pack.5mh4eR/_new 2006-11-24 16:19:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.14.2)
+# spec file for package yast2-qt (Version 2.14.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-qt
-Version: 2.14.2
+Version: 2.14.3
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.14.2.tar.bz2
+Source0: yast2-qt-2.14.3.tar.bz2
prefix: /usr
BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools
Summary: YaST2 - Graphical User Interface
@@ -42,7 +42,7 @@
Stefan Hundhammer
%prep
-%setup -n yast2-qt-2.14.2
+%setup -n yast2-qt-2.14.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -85,6 +85,9 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog -n yast2-qt
+* Thu Nov 23 2006 - sh@suse.de
+- Fixed bug #223416: Updated patches not visible in default view
+- V 2.14.3
* Tue Nov 21 2006 - sh@suse.de
- V 2.14.2
- Fixed bug #222505 (left-handed mouse)
++++++ yast2-qt-2.14.2.tar.bz2 -> yast2-qt-2.14.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.2/VERSION new/yast2-qt-2.14.3/VERSION
--- old/yast2-qt-2.14.2/VERSION 2006-11-21 12:05:22.000000000 +0100
+++ new/yast2-qt-2.14.3/VERSION 2006-11-23 16:50:23.000000000 +0100
@@ -1 +1 @@
-2.14.2
+2.14.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.2/configure new/yast2-qt-2.14.3/configure
--- old/yast2-qt-2.14.2/configure 2006-11-21 12:06:47.000000000 +0100
+++ new/yast2-qt-2.14.3/configure 2006-11-23 16:51:51.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-qt 2.14.2.
+# Generated by GNU Autoconf 2.59 for yast2-qt 2.14.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-qt'
PACKAGE_TARNAME='yast2-qt'
-PACKAGE_VERSION='2.14.2'
-PACKAGE_STRING='yast2-qt 2.14.2'
+PACKAGE_VERSION='2.14.3'
+PACKAGE_STRING='yast2-qt 2.14.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -971,7 +971,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-qt 2.14.2 to adapt to many kinds of systems.
+\`configure' configures yast2-qt 2.14.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1042,7 +1042,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-qt 2.14.2:";;
+ short | recursive ) echo "Configuration of yast2-qt 2.14.3:";;
esac
cat <<\_ACEOF
@@ -1191,7 +1191,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-qt configure 2.14.2
+yast2-qt configure 2.14.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1205,7 +1205,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-qt $as_me 2.14.2, which was
+It was created by yast2-qt $as_me 2.14.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1935,7 +1935,7 @@
# Define the identity of the package.
PACKAGE='yast2-qt'
- VERSION='2.14.2'
+ VERSION='2.14.3'
cat >>confdefs.h <<_ACEOF
@@ -2146,7 +2146,7 @@
-VERSION="2.14.2"
+VERSION="2.14.3"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -20510,7 +20510,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-qt $as_me 2.14.2, which was
+This file was extended by yast2-qt $as_me 2.14.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20573,7 +20573,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-qt config.status 2.14.2
+yast2-qt config.status 2.14.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.2/configure.in new/yast2-qt-2.14.3/configure.in
--- old/yast2-qt-2.14.2/configure.in 2006-11-21 12:06:33.000000000 +0100
+++ new/yast2-qt-2.14.3/configure.in 2006-11-23 16:51:37.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.1 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-qt, 2.14.2, http://bugs.opensuse.org/, yast2-qt)
+AC_INIT(yast2-qt, 2.14.3, http://bugs.opensuse.org/, yast2-qt)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.14.2"
+VERSION="2.14.3"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.14.2/src/YQPkgPatchList.cc new/yast2-qt-2.14.3/src/YQPkgPatchList.cc
--- old/yast2-qt-2.14.2/src/YQPkgPatchList.cc 2006-11-10 14:11:03.000000000 +0100
+++ new/yast2-qt-2.14.3/src/YQPkgPatchList.cc 2006-11-24 12:44:21.000000000 +0100
@@ -38,7 +38,7 @@
typedef zypp::ui::PatchContents ZyppPatchContents;
-typedef zypp::ui::PatchContents::const_iterator ZyppPatchContentsIterator;
+typedef zypp::ui::PatchContents::const_iterator ZyppPatchContentsIterator;
using std::list;
using std::set;
@@ -54,15 +54,15 @@
int numCol = 0;
addColumn( "" ); _statusCol = numCol++;
addColumn( _( "Patch" ) ); _summaryCol = numCol++;
- addColumn( _( "Category" ) ); _categoryCol = numCol++;
- addColumn( _( "Size" ) ); _sizeCol = numCol++;
+ addColumn( _( "Category" ) ); _categoryCol = numCol++;
+ addColumn( _( "Size" ) ); _sizeCol = numCol++;
// Can use the same colum for "broken" and "satisfied":
// Both states are mutually exclusive
-
+
_satisfiedIconCol = _summaryCol;
_brokenIconCol = _summaryCol;
-
+
setAllColumnsShowFocus( true );
setColumnAlignment( sizeCol(), Qt::AlignRight );
@@ -111,7 +111,7 @@
it != zyppPatchesEnd();
++it )
{
- ZyppSel selectable = *it;
+ ZyppSel selectable = *it;
ZyppPatch zyppPatch = tryCastToZyppPatch( selectable->theObj() );
if ( zyppPatch )
@@ -120,14 +120,15 @@
switch ( _filterCriteria )
{
- case RelevantPatches: // needed + broken
+ case RelevantPatches: // needed + broken + satisfied (but not installed)
if ( selectable->hasInstalledObj() ) // installed?
{
- // display only if broken
-
- if ( selectable->installedPoolItem().status().isIncomplete() )
+ if ( selectable->installedPoolItem().status().isIncomplete() ) // patch broken?
{
+ // The patch is broken: It had been installed, but the user somehow
+ // downgraded individual packages belonging to the patch to older versions.
+
displayPatch = true;
y2warning( "Installed patch is broken: %s - %s",
@@ -135,24 +136,52 @@
zyppPatch->summary().c_str() );
}
}
- else // not installed - display only if needed
+ else // not installed
{
- zypp::ResStatus candidateStatus = selectable->candidatePoolItem().status();
-
- if ( candidateStatus.isNeeded() ||
- candidateStatus.isSatisfied() )
+ if ( selectable->hasCandidateObj() &&
+ selectable->candidatePoolItem().status().isSatisfied() )
+ {
+ // This is a pretty exotic case, but still it might happen:
+ //
+ // The patch itelf is not installed, but it is satisfied because the
+ // user updated all the packages belonging to the patch to the versions
+ // the patch requires. All that is missing now is to get the patch meta
+ // data onto the system. So let's display the patch to give the user
+ // a chance to install it (if he so chooses).
+
+ displayPatch = true;
+
+ y2milestone( "Patch satisfied, but not installed yet: %s - %s",
+ zyppPatch->name().c_str(),
+ zyppPatch->summary().c_str() );
+ }
+ }
+
+ if ( selectable->hasCandidateObj() ) // candidate available?
+ {
+ // The most common case: There is a candidate patch, i.e. one that could be
+ // installed, but either no version of that patch is installed or there is a
+ // newer one to which the patch could be updated.
+
+ if ( selectable->candidatePoolItem().status().isNeeded() ) // patch really needed?
{
+ // Patches are needed if any of the packages that belong to the patch
+ // are installed on the system.
+
displayPatch = true;
}
else
{
- y2milestone( "Patch not needed: %s - %s",
- zyppPatch->name().c_str(),
- zyppPatch->summary().c_str() );
+ // None of the packages that belong to the patch is installed on the system.
+
+ y2debug( "Patch not needed: %s - %s",
+ zyppPatch->name().c_str(),
+ zyppPatch->summary().c_str() );
}
}
break;
+
case RelevantAndInstalledPatches: // needed + broken + installed
if ( selectable->hasInstalledObj() ) // installed?
@@ -177,6 +206,7 @@
}
break;
+
case AllPatches:
displayPatch = true;
break;
@@ -414,9 +444,9 @@
-YQPkgPatchListItem::YQPkgPatchListItem( YQPkgPatchList * patchList,
+YQPkgPatchListItem::YQPkgPatchListItem( YQPkgPatchList * patchList,
ZyppSel selectable,
- ZyppPatch zyppPatch )
+ ZyppPatch zyppPatch )
: YQPkgObjListItem( patchList, selectable, zyppPatch )
, _patchList( patchList )
, _zyppPatch( zyppPatch )
@@ -443,7 +473,7 @@
case YQPkgRecommendedPatch: setTextColor( QColor( 0, 0, 0xC0 ) ); break; // medium blue
case YQPkgOptionalPatch: break;
case YQPkgDocumentPatch: break;
- case YQPkgUnknownPatchCategory: break;
+ case YQPkgUnknownPatchCategory: break;
}
}
@@ -476,12 +506,12 @@
switch ( category )
{
// Translators: These are patch categories
- case YQPkgYaSTPatch: return _( "YaST" );
+ case YQPkgYaSTPatch: return _( "YaST" );
case YQPkgSecurityPatch: return _( "security" );
- case YQPkgRecommendedPatch: return _( "recommended" );
+ case YQPkgRecommendedPatch: return _( "recommended" );
case YQPkgOptionalPatch: return _( "optional" );
case YQPkgDocumentPatch: return _( "document" );
- case YQPkgUnknownPatchCategory: return "";
+ case YQPkgUnknownPatchCategory: return "";
}
return "";
@@ -511,7 +541,7 @@
}
else
{
- if ( ( col == brokenIconCol() && isBroken() ) ||
+ if ( ( col == brokenIconCol() && isBroken() ) ||
( col == satisfiedIconCol() && isSatisfied() ) )
{
text = YQPkgObjListItem::toolTip( col );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org