rpms/hal-cups-utils/devel hal-cups-utils-traceback.patch, NONE, 1.1 hal-cups-utils.spec, 1.71, 1.72

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hal-cups-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29925

Modified Files:
	hal-cups-utils.spec 
Added Files:
	hal-cups-utils-traceback.patch 
Log Message:
* Thu Oct 16 2008 Tim Waugh <twaugh at redhat.com> 0.6.17-2
- Don't log a traceback if sys.exit() is called (bug #466485).


hal-cups-utils-traceback.patch:

--- NEW FILE hal-cups-utils-traceback.patch ---
diff -U0 hal-cups-utils-0.6.17/ChangeLog.traceback hal-cups-utils-0.6.17/ChangeLog
diff -up hal-cups-utils-0.6.17/systemv/hal_lpadmin.traceback hal-cups-utils-0.6.17/systemv/hal_lpadmin
--- hal-cups-utils-0.6.17/systemv/hal_lpadmin.traceback	2008-07-05 12:45:03.000000000 +0100
+++ hal-cups-utils-0.6.17/systemv/hal_lpadmin	2008-10-16 14:40:07.000000000 +0100
@@ -474,6 +474,8 @@ def main():
     time.sleep (1) # Give HPLIP a chance to reconnect
     try:
         h = HalLpAdmin()
+    except SystemExit, e:
+        sys.exit (e)
     except:
         (type, value, tb) = sys.exc_info ()
         tblast = traceback.extract_tb (tb, limit=None)


Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- hal-cups-utils.spec	2 Oct 2008 17:06:21 -0000	1.71
+++ hal-cups-utils.spec	16 Oct 2008 13:41:48 -0000	1.72
@@ -1,13 +1,14 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.6.17
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/hal-cups-utils
 # Add "?format=raw" to the following URL to download file:
 Source: https://fedorahosted.org/hal-cups-utils/attachment/wiki/ProjectReleases/%{name}-%{version}.tar.gz
 Source1: cups-config-daemon
+Patch1: hal-cups-utils-traceback.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel
 BuildRequires: dbus-devel >= 0.60
@@ -29,6 +30,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
+%patch1 -p1 -b .traceback
 
 %build
 
@@ -60,6 +62,9 @@
 %{_initrddir}/cups-config-daemon
 
 %changelog
+* Thu Oct 16 2008 Tim Waugh <twaugh at redhat.com> 0.6.17-2
+- Don't log a traceback if sys.exit() is called (bug #466485).
+
 * Mon Jul  7 2008 Tim Waugh <twaugh at redhat.com> 0.6.17-1
 - 0.6.17.  Requires system-config-printer-libs >= 1.0.3.