From: Albert Astals Cid <albert.astals.cid@kdab.com>
Date: Tue, 2 Jan 2018 15:17:07 +0000 (+0100)
Subject: Fix ppdInstallableConflict conflict reporting
X-Git-Tag: v2.3b2~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a9942a2f0080dd20aa7b95a2c08a9ffd8ebd6f0;p=thirdparty%2Fcups.git

Fix ppdInstallableConflict conflict reporting

Without this patch it was taking all constraints into account, not only the ones
regarding the passed option so if you had a conflict somewhere else, every other
single option would be said to be conflicting which doesn't match what the
documentation says this function should do.
---

diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c
index 72b476c154..ff4d0570d3 100644
--- a/cups/ppd-conflicts.c
+++ b/cups/ppd-conflicts.c
@@ -993,7 +993,7 @@ ppd_test_constraints(
     if (!consts->installable && which == _PPD_INSTALLABLE_CONSTRAINTS)
       continue;				/* Skip non-installable option constraint */
 
-    if (which == _PPD_OPTION_CONSTRAINTS && option)
+    if ((which == _PPD_OPTION_CONSTRAINTS || which == _PPD_INSTALLABLE_CONSTRAINTS) && option)
     {
      /*
       * Skip constraints that do not involve the current option...