commit yast2-xml

2 Jun 2006

Hello community,

here is the log from the commit of package yast2-xml
checked in at Fri Jun 2 02:15:31 CEST 2006.

--------

--- yast2-xml/yast2-xml.changes	2006-02-06 09:53:06.000000000 +0100
+++ yast2-xml/yast2-xml.changes	2006-06-01 15:10:26.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Jun  1 15:05:23 CEST 2006 - visnov@suse.cz
+
+- De-register error handler when not parsing anymore (#175197)
+- 2.13.2 
+
+-------------------------------------------------------------------

Old:
----
  yast2-xml-2.13.1.tar.bz2

New:
----
  yast2-xml-2.13.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-xml.spec ++++++
--- /var/tmp/diff_new_pack.XEs2Hx/_old	2006-06-02 02:15:25.000000000 +0200
+++ /var/tmp/diff_new_pack.XEs2Hx/_new	2006-06-02 02:15:25.000000000 +0200
@@ -1,23 +1,23 @@
 #
-# spec file for package yast2-xml (Version 2.13.1)
+# spec file for package yast2-xml (Version 2.13.2)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
 Name:         yast2-xml
 URL:          http://www.suse.de/
-Version:      2.13.1
+Version:        2.13.2
 Release:      1
 License:      GPL
 Group:        System/YaST
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Source0:      yast2-xml-2.13.1.tar.bz2
+Source0:        yast2-xml-2.13.2.tar.bz2
 prefix:		/usr
 BuildRequires: doxygen gcc-c++ libxcrypt-devel yast2-core-devel yast2-devtools
 Summary:      YaST2 - XML Agent
@@ -36,7 +36,7 @@
     Anas Nashif <nashif@suse.de>
 
 %prep
-%setup -n yast2-xml-2.13.1
+%setup -n yast2-xml-2.13.2
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -68,6 +68,9 @@
 %doc %{prefix}/share/doc/packages/yast2-xml
 
 %changelog -n yast2-xml
+* Thu Jun 01 2006 - visnov@suse.cz
+- De-register error handler when not parsing anymore (#175197)
+- 2.13.2
 * Mon Feb 06 2006 - jsuchome@suse.cz
 - reduced BuildRequires
 - 2.13.1

++++++ yast2-xml-2.13.1.tar.bz2 -> yast2-xml-2.13.2.tar.bz2 ++++++
++++   11006 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-xml-2.13.1/Makefile.am new/yast2-xml-2.13.2/Makefile.am
--- old/yast2-xml-2.13.1/Makefile.am	2006-02-06 09:33:08.000000000 +0100
+++ new/yast2-xml-2.13.2/Makefile.am	2006-05-24 15:56:01.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 package-local
+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 \
@@ -199,10 +200,13 @@
 		false;							\
 	fi
 
+check-textdomain:
+	$(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-xml-2.13.1/VERSION new/yast2-xml-2.13.2/VERSION
--- old/yast2-xml-2.13.1/VERSION	2006-02-06 09:41:07.000000000 +0100
+++ new/yast2-xml-2.13.2/VERSION	2006-06-01 15:05:22.000000000 +0200
@@ -1 +1 @@
-2.13.1
+2.13.2
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-xml-2.13.1/autodocs-cc-base.ami new/yast2-xml-2.13.2/autodocs-cc-base.ami
--- old/yast2-xml-2.13.1/autodocs-cc-base.ami	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-xml-2.13.2/autodocs-cc-base.ami	2006-05-24 15:56:01.000000000 +0200
@@ -0,0 +1,24 @@
+# -*- makefile -*- Automake include file
+# $Id: autodocs-cc.ami 23704 2005-06-10 17:36:13Z mvidner $
+
+# This is a common base for autodocs-cc-{,off}.ami
+# and should NOT be used directly
+
+# Builds source documentation for C++ sources
+# Uses doxygen (ydoxygen)
+# PARAMETERS:
+#   AUTODOCS_CC: Directories that the C++ autodocs is built from
+#		 Optional - the default is $(srcdir)/../../src
+#   AUTODOCS_DEPS: dependencies of the docs, default is $(AUTODOCS_CC)/*.h
+#   AUTODOCS_PARAMS: more params for ydoxygen
+
+AUTODOCS_CC ?= $(srcdir)/../../src
+AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h
+
+html_data = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag
+CLEANFILES = $(html_data) doxygen.log doxygen.conf installdox
+
+doxygen.css @RPMNAME@.tag: index.html
+
+index.html: $(AUTODOCS_DEPS)
+	${YDOXYGEN} PROJECT_NAME=@RPMNAME@ INPUT=$(AUTODOCS_CC) $(AUTODOCS_PARAMS)
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-xml-2.13.1/autodocs-cc.ami new/yast2-xml-2.13.2/autodocs-cc.ami
--- old/yast2-xml-2.13.1/autodocs-cc.ami	2006-02-06 09:33:08.000000000 +0100
+++ new/yast2-xml-2.13.2/autodocs-cc.ami	2006-05-24 15:56:01.000000000 +0200
@@ -1,24 +1,14 @@
 # -*- makefile -*- Automake include file
-# $Id: autodocs-cc.ami 23704 2005-06-10 17:36:13Z mvidner $
+# $Id: autodocs-cc.ami 28248 2006-02-21 14:14:07Z mvidner $
 
-# Builds source documentation for C++ sources
-# Uses doxygen (ydoxygen)
-# PARAMETERS:
-#   AUTODOCS_CC: Directories that the C++ autodocs is built from
-#		 Optional - the default is $(srcdir)/../../src
-#   AUTODOCS_DEPS: dependencies of the docs, default is $(AUTODOCS_CC)/*.h
+# Builds source documentation for C++ sources.
+# Builds and installs by default, intended for base packages where the
+# docs is useful for developers of leaf packages.
+
+# PARAMETERS: (additional to those of autodocs-cc-base)
 #   AUTODOCS_SUBDIR: htmldir will be $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-#   AUTODOCS_PARAMS: more params for ydoxygen
 
-AUTODOCS_CC ?= $(srcdir)/../../src
-AUTODOCS_DEPS ?= $(AUTODOCS_CC)/*.h
+include $(top_srcdir)/autodocs-cc-base.ami
 
 htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-
-html_DATA = index.html $(wildcard *.html *.png) doxygen.css @RPMNAME@.tag
-CLEANFILES = $(html_DATA) doxygen.log doxygen.conf installdox
-
-doxygen.css @RPMNAME@.tag: index.html
-
-index.html: $(AUTODOCS_DEPS)
-	${YDOXYGEN} PROJECT_NAME=@RPMNAME@ INPUT=$(AUTODOCS_CC) $(AUTODOCS_PARAMS)
+html_DATA = $(html_data)
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-xml-2.13.1/configure.in new/yast2-xml-2.13.2/configure.in
--- old/yast2-xml-2.13.1/configure.in	2006-02-06 09:33:08.000000000 +0100
+++ new/yast2-xml-2.13.2/configure.in	2006-05-24 15:56:01.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-xml
 dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-xml, 2.13.0, http://www.suse.de/feedback, yast2-xml)
+AC_INIT(yast2-xml, 2.13.1, http://bugs.opensuse.org/, yast2-xml)
 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.0"
+VERSION="2.13.1"
 RPMNAME="yast2-xml"
 MAINTAINER="Martin Vidner <mvidner@suse.cz>"
 
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-xml-2.13.1/src/XmlAgent.cc new/yast2-xml-2.13.2/src/XmlAgent.cc
--- old/yast2-xml-2.13.1/src/XmlAgent.cc	2006-02-03 15:37:49.000000000 +0100
+++ new/yast2-xml-2.13.2/src/XmlAgent.cc	2006-06-01 15:08:54.000000000 +0200
@@ -7,7 +7,7 @@
  * Authors:
  *   Anas Nashif <nashif@suse.de>
  *
- * $Id: XmlAgent.cc 26962 2006-01-11 15:15:38Z mvidner $
+ * $Id: XmlAgent.cc 31246 2006-06-01 13:08:48Z visnov $
  */
 
 #include "XmlAgent.h"
@@ -755,6 +755,7 @@
     else
     {
 
+	y2milestone( "Setting XML generic error handler" );
 	xmlSetGenericErrorFunc (ctxt, (xmlGenericErrorFunc) xmlagentError);
 
 	memcpy(&silent, ctxt->sax, sizeof(silent));
@@ -781,10 +782,19 @@
 
 	xi = xmlXIncludeProcess(doc);
 	if (xi == -1)
+	{
+	    y2milestone( "Freeing generic XML error handler");
+	    xmlSetGenericErrorFunc( NULL, NULL );
 	    return YCPError(string ("Failed while processing XIncludes"));
+	}
 
 	ctxt->sax = old;
+
+	y2milestone( "Freeing generic XML error handler");
+	xmlSetGenericErrorFunc( NULL, NULL );
+
 	xmlFreeParserCtxt(ctxt);
+
 	if (!ret)
 	{
 	    xmlFreeDoc(doc);


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org

    

commit yast2-xml

root＠suse.de