The `ipptool` program no longer checks for duplicate attributes when running in

list or CSV mode (Issue #5278)

diff --git a/CHANGES.md b/CHANGES.md
index 896ddee04a273fd21d631fc7e0e5dd6e80f69a32..9dc02b4fd80942ceda234dca035617dc72ef9512 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,12 @@
-CHANGES - 2.3b4 - 2018-03-23
-============================
+CHANGES - 2.3rc1 - 2018-04-02
+=============================
+
+Changes in CUPS v2.3rc1
+-----------------------
+
+- The `ipptool` program no longer checks for duplicate attributes when running
+  in list or CSV mode (Issue #5278)
+
 
 Changes in CUPS v2.3b4
 ----------------------

diff --git a/test/ipptool.c b/test/ipptool.c
index 8a5ed247d7d138a1c38a0427dcd43636ca4d18eb..697ea8a9623e0c2f4411e8694173d248a7d4dad4 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -1269,7 +1269,7 @@ do_test(_ipp_file_t      *f,              /* I - IPP data file */
 
        if (ippGetName(attrptr))
        {
-         if (cupsArrayFind(a, (void *)ippGetName(attrptr)))
+         if (cupsArrayFind(a, (void *)ippGetName(attrptr)) && data->output < _CUPS_OUTPUT_LIST)
            add_stringf(data->errors, "Duplicate \"%s\" attribute in %s group",
                        ippGetName(attrptr), ippTagString(group));