From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 21 Aug 2018 14:09:49 +0000 (-0400)
Subject: Don't try to map cupsFinishingTemplate=none, fall back to individual options to get... 
X-Git-Tag: v2.3b6~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d128cfc60175914a5c92b3b72f1471e6343a211d;p=thirdparty%2Fcups.git

Don't try to map cupsFinishingTemplate=none, fall back to individual options to get there.
---

diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c
index ef0f6f50ef..bae64e059e 100644
--- a/cups/ppd-cache.c
+++ b/cups/ppd-cache.c
@@ -367,7 +367,7 @@ _cupsConvertOptions(
   if ((finishing_template = cupsGetOption("cupsFinishingTemplate", num_options, options)) == NULL)
     finishing_template = cupsGetOption("finishing-template", num_options, options);
 
-  if (finishing_template)
+  if (finishing_template && strcmp(finishing_template, "none"))
   {
     ipp_t *fin_col = ippNew();		/* finishings-col value */