[kernel] r19895 - in dists/sid/linux/debian: . bin

[Ben Hutchings]

Author: benh
Date: Sun Mar  3 23:40:22 2013
New Revision: 19895

Log:
test-patches: Clean up all previous test patches, whether or not they were applied

Modified:
   dists/sid/linux/debian/bin/test-patches
   dists/sid/linux/debian/changelog

Modified: dists/sid/linux/debian/bin/test-patches
==============================================================================
--- dists/sid/linux/debian/bin/test-patches	Sun Mar  3 02:58:47 2013	(r19894)
+++ dists/sid/linux/debian/bin/test-patches	Sun Mar  3 23:40:22 2013	(r19895)
@@ -63,8 +63,9 @@
 
 # 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}

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Mar  3 02:58:47 2013	(r19894)
+++ dists/sid/linux/debian/changelog	Sun Mar  3 23:40:22 2013	(r19895)
@@ -12,6 +12,8 @@
   * [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 at decadent.org.uk>  Wed, 27 Feb 2013 03:48:30 +0000