rpms/cups
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f14'

Browse Source
This commit is contained in:
Tim Waugh 2011-03-10 13:43:40 +00:00
commit d6f50937a8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cups-lspp.patch
View File

@ -2769,7 +2769,7 @@ diff -urNp cups-1.4.6.old/scheduler/printers.c cups-1.4.6/scheduler/printers.c
+ if (getfilecon(printerfile, &devcon) == -1) + if (getfilecon(printerfile, &devcon) == -1)
+ { + {
+ if(is_selinux_enabled()) + if(is_selinux_enabled())
+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSetPrinterAttrs: Unable to get printer context");
+ } + }
+ else + else
+ { + {

1
cups.spec
View File

@ -612,6 +612,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Mar 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-14 * Thu Mar 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-14
- Fixed some typos in colord patch. - Fixed some typos in colord patch.
- LSPP: only warn when unable to get printer context.
* Mon Mar 07 2011 Richard Hughes <rhughes@redhat.com> 1:1.4.6-13 * Mon Mar 07 2011 Richard Hughes <rhughes@redhat.com> 1:1.4.6-13
- Updated colord patch. - Updated colord patch.