rpms/parted/devel parted-1.7.1-get_exception.patch, NONE, 1.1 parted.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11444

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-get_exception.patch 
Log Message:
- add ped_get_exception_handler()


parted-1.7.1-get_exception.patch:
 include/parted/exception.h |    2 ++
 libparted/exception.c      |   11 +++++++++++
 2 files changed, 13 insertions(+)

--- NEW FILE parted-1.7.1-get_exception.patch ---
--- parted-1.7.1/include/parted/exception.h.get_exception	2006-07-05 15:31:11.000000000 -0400
+++ parted-1.7.1/include/parted/exception.h	2006-07-05 15:31:34.000000000 -0400
@@ -88,6 +88,8 @@
 extern char* ped_exception_get_option_string (PedExceptionOption ex_opt);
 
 extern void ped_exception_set_handler (PedExceptionHandler* handler);
+extern PedExceptionHandler *ped_exception_get_handler(void);
+
 extern PedExceptionOption ped_exception_default_handler (PedException* ex);
 
 extern PedExceptionOption	ped_exception_throw (PedExceptionType ex_type,
--- parted-1.7.1/libparted/exception.c.get_exception	2006-07-05 15:33:33.000000000 -0400
+++ parted-1.7.1/libparted/exception.c	2006-07-05 15:33:36.000000000 -0400
@@ -171,6 +171,17 @@
 }
 
 /**
+ * Get the current exception handler.
+ */
+PedExceptionHandler *
+ped_exception_get_handler (void)
+{
+	if (ex_handler)
+		return ex_handler;
+	return default_handler;
+}
+
+/**
  * Assert that the current exception has been resolved.
  */
 void


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- parted.spec	26 Jun 2006 16:14:18 -0000	1.77
+++ parted.spec	5 Jul 2006 19:36:55 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name: parted
 Version: 1.7.1
-Release: 8
+Release: 9
 Source: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0: parted-1.7.0-fat.c.patch
 Patch1: parted-1.7.0-sx8.patch
@@ -14,6 +14,7 @@
 Patch6: parted-1.7.0-aix.patch
 Patch7: parted-1.7.0-headers.patch
 Patch8: parted-1.7.1-O_DIRECT.patch
+Patch9: parted-1.7.1-get_exception.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -51,6 +52,7 @@
 %patch6 -p1 -b .aix
 %patch7 -p1 -b .headers
 %patch8 -p1 -b .o_direct
+%patch9 -p1 -b .get_exception
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -104,7 +106,10 @@
 %{_libdir}/*.so
 
 %changelog
-* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com>
+* Wed Jul  5 2006 Peter Jones <pjones at redhat.com> - 1.7.1-9
+- add ped_exception_get_handler()
+
+* Mon Jun 26 2006 Florian La Roche <laroche at redhat.com> - 1.7.1-8
 - remove info files in preun
 
 * Thu Jun 22 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-7