From 77d791b63f18a36435a9d85e2aeeed3c0acffe03 Mon Sep 17 00:00:00 2001
From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Fri, 24 Aug 2012 03:26:57 +0000
Subject: [PATCH] Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly
 erroring out.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10570 7a7537e8-13f0-0310-91df-b6672ffda945
---
 CHANGES-1.6.txt     |  6 ++++++
 CHANGES-IPPTOOL.txt |  8 +++++++-
 test/ipptool.c      | 10 ++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 7d80d56f34..b43b8af795 100644
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -1,6 +1,12 @@
 CHANGES-1.6.txt
 ---------------
 
+CHANGES IN CUPS V1.6.2
+
+	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+	  out.
+
+
 CHANGES IN CUPS V1.6.1
 
 	- Documentation fix (STR #4149)
diff --git a/CHANGES-IPPTOOL.txt b/CHANGES-IPPTOOL.txt
index d16bbd5dde..861db490ef 100644
--- a/CHANGES-IPPTOOL.txt
+++ b/CHANGES-IPPTOOL.txt
@@ -1,10 +1,16 @@
-CHANGES-IPPTOOL.txt - 2012-02-28
+CHANGES-IPPTOOL.txt - 2012-08-23
 --------------------------------
 
 This file provides a list of changes to the ipptool binary distribution posted
 on cups.org.
 
 
+2012-MM-DD
+
+	- Fixed REPEAT-MATCH for STATUS and EXPECT - was incorrectly erroring
+	  out.
+
+
 2012-02-28
 
 	- Changed behavior of WITH-VALUES "/regex/" to not require all values to
diff --git a/test/ipptool.c b/test/ipptool.c
index 696a8922fa..537c299b21 100644
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -2660,9 +2660,10 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 		get_variable(vars, statuses[i].if_not_defined))
 	      continue;
 
-	    add_stringf(errors, "EXPECTED: STATUS %s (got %s)",
-			ippErrorString(statuses[i].status),
-			ippErrorString(cupsLastError()));
+            if (!statuses[i].repeat_match)
+	      add_stringf(errors, "EXPECTED: STATUS %s (got %s)",
+			  ippErrorString(statuses[i].status),
+			  ippErrorString(cupsLastError()));
 	  }
 
 	  if ((attrptr = ippFindAttribute(response, "status-message",
@@ -2726,7 +2727,8 @@ do_tests(_cups_vars_t *vars,		/* I - Variables */
 	  {
 	    if (expect->define_no_match)
 	      set_variable(vars, expect->define_no_match, "1");
-	    else if (!expect->define_match && !expect->define_value)
+	    else if (!expect->define_match && !expect->define_value &&
+	             !expect->repeat_match && !expect->repeat_no_match)
 	    {
 	      if (expect->with_flags & _CUPS_WITH_REGEX)
 		add_stringf(errors, "EXPECTED: %s %s /%s/",
-- 
2.47.3