rpms/cups/F-11 cups-filter-debug.patch, NONE, 1.1 cups.spec, 1.479, 1.480

Tim Waugh twaugh at fedoraproject.org
Tue Jun 23 17:13:09 UTC 2009


Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17608

Modified Files:
	cups.spec 
Added Files:
	cups-filter-debug.patch 
Log Message:
* Tue Jun 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.5
- Added more debugging output when constructing filter chain.


cups-filter-debug.patch:

--- NEW FILE cups-filter-debug.patch ---
diff -up cups-1.4rc1/scheduler/job.c.filter-debug cups-1.4rc1/scheduler/job.c
--- cups-1.4rc1/scheduler/job.c.filter-debug	2009-06-23 18:10:57.125572911 +0100
+++ cups-1.4rc1/scheduler/job.c	2009-06-23 18:11:31.495572481 +0100
@@ -544,10 +544,28 @@ cupsdContinueJob(cupsd_job_t *job)	/* I 
 
     if (!filters)
     {
+      mime_filter_t *current;
+
       cupsdLogJob(job, CUPSD_LOG_ERROR,
 		  "Unable to convert file %d to printable format!",
 		  job->current_file);
 
+      cupsdLogJob(job, CUPSD_LOG_ERROR,
+		  "Required: %s/%s -> %s/%s",
+		  job->filetypes[job->current_file]->super,
+		  job->filetypes[job->current_file]->type,
+		  job->printer->filetype->super,
+		  job->printer->filetype->type);
+
+      for (current = (mime_filter_t *)cupsArrayFirst(MimeDatabase->srcs);
+	   current;
+	   current = (mime_filter_t *)cupsArrayNext(MimeDatabase->srcs))
+	  cupsdLogJob(job, CUPSD_LOG_ERROR,
+		      "Available: %s/%s -> %s/%s (%s)",
+		      current->src->super, current->src->type,
+		      current->dst->super, current->dst->type,
+		      current->filter);
+
       abort_message = "Aborting job because it cannot be printed.";
       abort_state   = IPP_JOB_ABORTED;
 


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.479
retrieving revision 1.480
diff -u -p -r1.479 -r1.480
--- cups.spec	18 Jun 2009 17:59:15 -0000	1.479
+++ cups.spec	23 Jun 2009 17:12:38 -0000	1.480
@@ -7,7 +7,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4
-Release: 0.%{pre}.4%{?dist}
+Release: 0.%{pre}.5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -45,6 +45,7 @@ Patch21: cups-usb-paperout.patch
 Patch22: cups-build.patch
 Patch23: cups-res_init.patch
 Patch24: cups-str3229.patch
+Patch25: cups-filter-debug.patch
 Patch26: cups-avahi.patch
 Patch100: cups-lspp.patch
 Epoch: 1
@@ -186,6 +187,7 @@ module. 
 %patch22 -p1 -b .build
 %patch23 -p1 -b .res_init
 %patch24 -p1 -b .str3229
+%patch25 -p1 -b .filter-debug
 #%patch26 -p1 -b .avahi
 
 %if %lspp
@@ -470,6 +472,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php/modules/*.so
 
 %changelog
+* Tue Jun 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.5
+- Added more debugging output when constructing filter chain.
+
 * Thu Jun 18 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.4
 - More complete fix for STR #3229 (bug #506461).
 




More information about the fedora-extras-commits mailing list