From d07cb8d5dc91f63e18f83e229f474edfb890f4ba Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 2 Apr 2018 20:18:11 -0400 Subject: [PATCH] The `ipptool` program no longer checks for duplicate attributes when running in list or CSV mode (Issue #5278) --- CHANGES.md | 11 +++++++++-- test/ipptool.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 896ddee04a..9dc02b4fd8 100644 --- 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 8a5ed247d7..697ea8a962 100644 --- 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)); -- 2.47.2