Hello community,
here is the log from the commit of package yast2-qt
checked in at Thu Apr 20 14:45:31 CEST 2006.
--------
--- yast2-qt/yast2-qt.changes 2006-04-18 18:00:15.000000000 +0200
+++ STABLE/yast2-qt/yast2-qt.changes 2006-04-20 12:48:27.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 20 12:47:39 CEST 2006 - mvidner@suse.cz
+
+- Catch exceptions when calling package management code (#166278).
+- Adapted for libzypp in a nonstandard prefix.
+- 2.13.49
+
+-------------------------------------------------------------------
Old:
----
yast2-qt-2.13.48.tar.bz2
New:
----
yast2-qt-2.13.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-qt.spec ++++++
--- /var/tmp/diff_new_pack.8OfeBD/_old 2006-04-20 14:44:03.000000000 +0200
+++ /var/tmp/diff_new_pack.8OfeBD/_new 2006-04-20 14:44:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-qt (Version 2.13.48)
+# spec file for package yast2-qt (Version 2.13.49)
#
# 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.48
+Version: 2.13.49
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-qt-2.13.48.tar.bz2
+Source0: yast2-qt-2.13.49.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.48
+%setup -n yast2-qt-2.13.49
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,10 @@
%doc %{prefix}/share/doc/packages/yast2-qt
%changelog -n yast2-qt
+* Thu Apr 20 2006 - mvidner@suse.cz
+- Catch exceptions when calling package management code (#166278).
+- Adapted for libzypp in a nonstandard prefix.
+- 2.13.49
* Tue Apr 18 2006 - sh@suse.de
- V 2.13.48
- Added infrastructure to fix bug #164869: Duplicate "Accept" button
++++++ yast2-qt-2.13.48.tar.bz2 -> yast2-qt-2.13.49.tar.bz2 ++++++
++++ 23356 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.48/Makefile.am new/yast2-qt-2.13.49/Makefile.am
--- old/yast2-qt-2.13.48/Makefile.am 2006-03-27 17:07:05.000000000 +0200
+++ new/yast2-qt-2.13.49/Makefile.am 2006-04-20 13:56:10.000000000 +0200
@@ -8,6 +8,7 @@
#where devtools are
PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -95,7 +96,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +117,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +144,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -200,12 +201,12 @@
fi
check-textdomain:
- $(PREFIX)/bin/y2tool check-textdomain $(srcdir)
+ $(Y2TOOL) check-textdomain $(srcdir)
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
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.48/VERSION new/yast2-qt-2.13.49/VERSION
--- old/yast2-qt-2.13.48/VERSION 2006-04-18 17:39:16.000000000 +0200
+++ new/yast2-qt-2.13.49/VERSION 2006-04-20 12:47:02.000000000 +0200
@@ -1 +1 @@
-2.13.48
+2.13.49
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.48/configure.in new/yast2-qt-2.13.49/configure.in
--- old/yast2-qt-2.13.48/configure.in 2006-03-27 17:07:05.000000000 +0200
+++ new/yast2-qt-2.13.49/configure.in 2006-04-20 13:56:10.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-qt
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+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.40, http://www.suse.de/feedback, yast2-qt)
+AC_INIT(yast2-qt, 2.13.49, 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.40"
+VERSION="2.13.49"
RPMNAME="yast2-qt"
MAINTAINER="Stefan Hundhammer "
@@ -183,6 +183,8 @@
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.48/configure.in.in new/yast2-qt-2.13.49/configure.in.in
--- old/yast2-qt-2.13.48/configure.in.in 2005-07-21 11:00:14.000000000 +0200
+++ new/yast2-qt-2.13.49/configure.in.in 2006-04-20 12:44:11.000000000 +0200
@@ -12,5 +12,7 @@
## special stuff
AC_MIN_QT_VERSION(301,3.01)
+PKG_CHECK_MODULES([ZYPP], [libzypp])
+
## and generate the output
@YAST2-OUTPUT@
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.48/src/Makefile.am new/yast2-qt-2.13.49/src/Makefile.am
--- old/yast2-qt-2.13.48/src/Makefile.am 2006-03-29 20:34:53.000000000 +0200
+++ new/yast2-qt-2.13.49/src/Makefile.am 2006-04-10 13:50:45.000000000 +0200
@@ -32,10 +32,10 @@
liby2qt_la_LDFLAGS = -version-info 2:0
libpy2qt_la_LIBADD = \
- -lyui \
+ -L$(libdir) -lyui \
-L$(QTLIBDIR) -lqt-mt \
-lX11 -lXext -lSM -lICE \
- -lzypp
+ ${ZYPP_LIBS}
liby2qt_la_LIBADD = $(libpy2qt_la_LIBADD)
@@ -398,4 +398,4 @@
CLEANFILES = *.moc y2qt.kdoc y2ui.kdoc
-INCLUDES = -I$(srcdir)/include -I$(QTDIR)/include -I$(includedir) -I$(includedir)/yui
+INCLUDES = -I$(srcdir)/include -I$(QTDIR)/include -I$(includedir) -I$(includedir)/yui ${ZYPP_CFLAGS}
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.48/src/YQUI_builtins.cc new/yast2-qt-2.13.49/src/YQUI_builtins.cc
--- old/yast2-qt-2.13.48/src/YQUI_builtins.cc 2006-03-09 14:38:36.000000000 +0100
+++ new/yast2-qt-2.13.49/src/YQUI_builtins.cc 2006-04-20 13:19:24.000000000 +0200
@@ -93,7 +93,22 @@
_wm_close_blocked = true;
_auto_activate_dialogs = false;
- YCPValue input = evaluateUserInput();
+ YCPValue input = YCPVoid();
+
+ try
+ {
+ input = evaluateUserInput();
+ }
+ catch (const std::exception & e)
+ {
+ y2error( "Caught std::exception: %s", e.what() );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+ catch (...)
+ {
+ y2error( "Caught unspecified exception." );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
_auto_activate_dialogs = true;
_wm_close_blocked = false;
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.48/src/YQUI_widgets.cc new/yast2-qt-2.13.49/src/YQUI_widgets.cc
--- old/yast2-qt-2.13.48/src/YQUI_widgets.cc 2006-03-09 14:38:36.000000000 +0100
+++ new/yast2-qt-2.13.49/src/YQUI_widgets.cc 2006-04-20 13:19:24.000000000 +0200
@@ -172,7 +172,23 @@
const YCPString & floppyDevice )
{
_auto_activate_dialogs = false;
- return new YQPackageSelector( (QWidget *) ( parent->widgetRep() ), opt, floppyDevice );
+ YWidget * w = 0;
+
+ try
+ {
+ w = new YQPackageSelector( (QWidget *) ( parent->widgetRep() ), opt, floppyDevice );
+ }
+ catch (const std::exception & e)
+ {
+ y2error( "Caught std::exception: %s", e.what() );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+ catch (...)
+ {
+ y2error( "Caught unspecified exception." );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+ return w;
}
YWidget * YQUI::createPkgSpecial ( YWidget * parent,
@@ -470,8 +486,23 @@
YWidget * YQUI::createPatternSelector( YWidget * parent,
YWidgetOpt & opt )
{
- return new YQPatternSelector( (QWidget *) ( parent->widgetRep() ),
- opt );
+ YWidget * w = 0;
+
+ try
+ {
+ w = new YQPatternSelector( (QWidget *) ( parent->widgetRep() ), opt );
+ }
+ catch (const std::exception & e)
+ {
+ y2error( "Caught std::exception: %s", e.what() );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+ catch (...)
+ {
+ y2error( "Caught unspecified exception." );
+ y2error( "This is a libzypp problem. Do not file a bug against the UI!" );
+ }
+ return w;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...