From 63ad08c556484c45032edd5a3fe3501c268dc8f9 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 3 Mar 2013 23:40:22 +0000
Subject: [PATCH] test-patches: Clean up all previous test patches, whether or
 not they were applied

svn path=/dists/sid/linux/; revision=19895
---
 debian/bin/test-patches | 5 +++--
 debian/changelog        | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/bin/test-patches b/debian/bin/test-patches
index fc17ede29..483b4f97f 100755
--- a/debian/bin/test-patches
+++ b/debian/bin/test-patches
@@ -63,8 +63,9 @@ alias quilt='quilt --quiltrc -'
 
 # Try to clean up any previous test patches
 if [ "$featureset" = none ]; then
-    while quilt top 2>/dev/null | grep -q ^test/; do
-        quilt delete
+    while patch="$(quilt next 2>/dev/null || quilt top 2>/dev/null)" && \
+	[ "${patch#test/}" != "$patch" ]; do
+        quilt delete -r "$patch"
     done
 else
     sed -i '/^test\//d' debian/patches/series-${featureset}
diff --git a/debian/changelog b/debian/changelog
index 3cf66fa96..ad2449d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ linux (3.2.39-3) UNRELEASED; urgency=low
   * [x86] ata_piix: reenable MS Virtual PC guests (fixes regression in
     3.2.19-1)
   * vhost: fix length for cross region descriptor (CVE-2013-0311)
+  * test-patches: Clean up all previous test patches, whether or not they
+    were applied
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 27 Feb 2013 03:48:30 +0000