Hello community,
here is the log from the commit of package yast2-qt
checked in at Thu Apr 20 19:04:06 CEST 2006.
--------
--- yast2-qt/yast2-qt.changes 2006-04-20 12:48:27.000000000 +0200
+++ STABLE/yast2-qt/yast2-qt.changes 2006-04-20 18:19:15.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Apr 20 18:18:14 CEST 2006 - sh@suse.de
+
+- V 2.13.50
+- Re-implemented list of problematic packages during update
+
+-------------------------------------------------------------------
+Thu Apr 20 17:15:49 CEST 2006 - sh@suse.de
+
+- Ask for confirmation to abandon changes if a language is changed
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.13.49.tar.bz2
New:
----
yast2-qt-2.13.50.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.NveJth/_old 2006-04-20 18:59:24.000000000 +0200
+++ /var/tmp/diff_new_pack.NveJth/_new 2006-04-20 18:59:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.13.49)
+# spec file for package yast2-qt (Version 2.13.50)
#
# 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.13.49
+Version: 2.13.50
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.13.49.tar.bz2
+Source0: yast2-qt-2.13.50.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.13.49
+%setup -n yast2-qt-2.13.50
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,11 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog -n yast2-qt
+* Thu Apr 20 2006 - sh@suse.de
+- V 2.13.50
+- Re-implemented list of problematic packages during update
+* Thu Apr 20 2006 - sh@suse.de
+- Ask for confirmation to abandon changes if a language is changed
* Thu Apr 20 2006 - mvidner@suse.cz
- Catch exceptions when calling package management code (#166278).
- Adapted for libzypp in a nonstandard prefix.
++++++ yast2-qt-2.13.49.tar.bz2 -> yast2-qt-2.13.50.tar.bz2 ++++++
++++ 31253 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.13.49/VERSION new/yast2-qt-2.13.50/VERSION
--- old/yast2-qt-2.13.49/VERSION 2006-04-20 12:47:02.000000000 +0200
+++ new/yast2-qt-2.13.50/VERSION 2006-04-20 18:18:04.000000000 +0200
@@ -1 +1 @@
-2.13.49
+2.13.50
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.13.49/configure.in new/yast2-qt-2.13.50/configure.in
--- old/yast2-qt-2.13.49/configure.in 2006-04-20 13:56:10.000000000 +0200
+++ new/yast2-qt-2.13.50/configure.in 2006-04-19 14:31:54.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-qt, 2.13.49, http://www.suse.de/feedback, yast2-qt)
+AC_INIT(yast2-qt, 2.13.48, http://www.suse.de/feedback, 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.13.49"
+VERSION="2.13.48"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -183,8 +183,6 @@
AC_MIN_QT_VERSION(301,3.01)
-PKG_CHECK_MODULES([ZYPP], [libzypp])
-
AC_CONFIG_FILES(Makefile src/include/icons/Makefile
src/include/Makefile
src/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.13.49/src/YQPackageSelector.cc new/yast2-qt-2.13.50/src/YQPackageSelector.cc
--- old/yast2-qt-2.13.49/src/YQPackageSelector.cc 2006-04-10 13:50:44.000000000 +0200
+++ new/yast2-qt-2.13.50/src/YQPackageSelector.cc 2006-04-20 17:58:30.000000000 +0200
@@ -258,15 +258,13 @@
if ( _updateMode )
{
-#ifdef FIXME
- if ( ! Y2PM::packageManager().updateEmpty()
+ if ( YQPkgUpdateProblemFilterView::haveProblematicPackages()
|| _testMode )
{
_updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent );
CHECK_PTR( _updateProblemFilterView );
_filters->addPage( _( "Update Problems" ), _updateProblemFilterView );
}
-#endif
}
@@ -343,7 +341,7 @@
_langList = new YQPkgLangList( parent );
CHECK_PTR( _langList );
-
+
_filters->addPage( _( "Languages" ), _langList );
_langList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); // hor/vert
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.13.49/src/YQPackageSelectorBase.cc new/yast2-qt-2.13.50/src/YQPackageSelectorBase.cc
--- old/yast2-qt-2.13.49/src/YQPackageSelectorBase.cc 2006-04-10 13:50:44.000000000 +0200
+++ new/yast2-qt-2.13.50/src/YQPackageSelectorBase.cc 2006-04-20 17:14:56.000000000 +0200
@@ -82,7 +82,8 @@
zyppPool().saveState();
zyppPool().saveState();
zyppPool().saveStatezypp::Selection();
- zyppPool().saveStatezypp::Patch ();
+ zyppPool().saveState();
+ zyppPool().saveState();
//
@@ -184,7 +185,8 @@
zyppPool().diffState() ||
zyppPool().diffState() ||
zyppPool().diffStatezypp::Selection() ||
- zyppPool().diffStatezypp::Patch();
+ zyppPool().diffState() ||
+ zyppPool().diffState();
if ( changes )
{
@@ -197,6 +199,9 @@
if ( zyppPool().diffStatezypp::Selection() )
y2milestone( "diffState() reports changed selections" );
+ if ( zyppPool().diffStatezypp::Language() )
+ y2milestone( "diffState() reports changed languates" );
+
if ( zyppPool().diffStatezypp::Patch() )
y2milestone( "diffState() reports changed patches" );
}
@@ -213,7 +218,8 @@
zyppPool().restoreState();
zyppPool().restoreState();
zyppPool().restoreStatezypp::Selection();
- zyppPool().restoreStatezypp::Patch ();
+ zyppPool().restoreState();
+ zyppPool().restoreState();
y2milestone( "Closing PackageSelector with \"Cancel\"" );
YQUI::ui()->sendEvent( new YCancelEvent() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.13.49/src/YQPkgUpdateProblemFilterView.cc new/yast2-qt-2.13.50/src/YQPkgUpdateProblemFilterView.cc
--- old/yast2-qt-2.13.49/src/YQPkgUpdateProblemFilterView.cc 2006-02-10 18:00:12.000000000 +0100
+++ new/yast2-qt-2.13.50/src/YQPkgUpdateProblemFilterView.cc 2006-04-20 18:08:55.000000000 +0200
@@ -26,6 +26,10 @@
#include "YQi18n.h"
#include "utf8.h"
+#include
+#include
+
+using std::list;
YQPkgUpdateProblemFilterView::YQPkgUpdateProblemFilterView( QWidget * parent )
@@ -75,20 +79,38 @@
{
emit filterStart();
-#ifdef FIXME
- PMManager::SelectableVec::const_iterator it = Y2PM::packageManager().updateBegin();
-
- while ( it != Y2PM::packageManager().updateEnd() )
+ listzypp::PoolItem_Ref problemList = zypp::getZYpp()->resolver()->problematicUpdateItems();
+
+ for ( listzypp::PoolItem_Ref::const_iterator it = problemList.begin();
+ it != problemList.end();
+ ++it )
{
- Selectable::Ptr selectable = *it;
- emit filterMatch( *it, ( *it)->theObj() );
+ ZyppPkg pkg = tryCastToZyppPkg( (*it).resolvable() );
- ++it;
+ if ( pkg )
+ {
+ ZyppSel sel = _selMapper.findZyppSel( pkg );
+
+ if ( sel )
+ {
+ y2milestone( "Problematic package: %s-%s",
+ pkg->name().c_str(), pkg->edition().asString().c_str() );
+
+ emit filterMatch( sel, pkg );
+ }
+ }
+
}
-#endif
emit filterFinished();
}
+bool
+YQPkgUpdateProblemFilterView::haveProblematicPackages()
+{
+ return ! zypp::getZYpp()->resolver()->problematicUpdateItems().empty();
+}
+
+
#include "YQPkgUpdateProblemFilterView.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-qt-2.13.49/src/include/YQPkgUpdateProblemFilterView.h new/yast2-qt-2.13.50/src/include/YQPkgUpdateProblemFilterView.h
--- old/yast2-qt-2.13.49/src/include/YQPkgUpdateProblemFilterView.h 2006-02-10 18:00:09.000000000 +0100
+++ new/yast2-qt-2.13.50/src/include/YQPkgUpdateProblemFilterView.h 2006-04-20 17:58:54.000000000 +0200
@@ -25,6 +25,7 @@
#include "YQZypp.h"
#include
+#include "YQPkgSelMapper.h"
/**
@@ -46,7 +47,13 @@
**/
virtual ~YQPkgUpdateProblemFilterView();
+ /**
+ * Check if there are any problematic packages at all, i.e. if it is
+ * worthwhile to create this widget at all
+ **/
+ static bool haveProblematicPackages();
+
public slots:
/**
@@ -83,6 +90,10 @@
**/
void filterFinished();
+
+protected:
+
+ YQPkgSelMapper _selMapper;
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...