rpms/gutenprint/devel gutenprint-foomaticppdupdate, 1.3, 1.4 gutenprint.spec, 1.45, 1.46

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/gutenprint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15694

Modified Files:
	gutenprint-foomaticppdupdate gutenprint.spec 
Log Message:
* Thu Jan 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-4
- When updating foomatic PPDs, don't give a traceback if some PPD is
  not strictly conformant (bug #481397).



Index: gutenprint-foomaticppdupdate
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint-foomaticppdupdate,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gutenprint-foomaticppdupdate	10 Jan 2009 13:01:24 -0000	1.3
+++ gutenprint-foomaticppdupdate	29 Jan 2009 12:34:36 -0000	1.4
@@ -55,7 +55,12 @@
     return ppdobj
 
 def update_ppdfile (ppdfile):
-    ppd = cups.PPD (ppdfile)
+    try:
+        ppd = cups.PPD (ppdfile)
+    except RuntimeError:
+        # Invalid PPD in some way.
+        return
+
     attr = ppd.findAttr ("FoomaticIDs")
     if not attr:
         return


Index: gutenprint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gutenprint/devel/gutenprint.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gutenprint.spec	10 Jan 2009 13:01:24 -0000	1.45
+++ gutenprint.spec	29 Jan 2009 12:34:36 -0000	1.46
@@ -4,7 +4,7 @@
 Name:           gutenprint
 Summary:        Printer Drivers Package.
 Version:        5.2.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -254,6 +254,10 @@
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Thu Jan 29 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-4
+- When updating foomatic PPDs, don't give a traceback if some PPD is
+  not strictly conformant (bug #481397).
+
 * Sat Jan 10 2009 Tim Waugh <twaugh at redhat.com> 5.2.3-3
 - Don't use popen2 in the foomatic PPD update script.