[kernel] r19073 - dists/sid/linux/debian/bin

[Ben Hutchings]

Author: benh
Date: Sun Jun  3 22:19:13 2012
New Revision: 19073

Log:
Update test-patches to work with a single patch series

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

Modified: dists/sid/linux/debian/bin/test-patches
==============================================================================
--- dists/sid/linux/debian/bin/test-patches	Sun Jun  3 22:04:15 2012	(r19072)
+++ dists/sid/linux/debian/bin/test-patches	Sun Jun  3 22:19:13 2012	(r19073)
@@ -56,10 +56,10 @@
 fi
 
 restrictfeature=
-series="${version##*-}"
-if [ "$featureset" != none ]; then
-    restrictfeature=" featureset=$featureset"
-    series="${series}-extra"
+if [ "$featureset" = none ]; then
+    series="series-all"
+else
+    series="series-${featureset}"
 fi
 
 # Copy all patches into a new directory
@@ -67,10 +67,13 @@
 mkdir debian/patches/test
 cp -t debian/patches/test/ "$@"
 
-# Generate patch series for the new version
->debian/patches/series/"$series"
+# Try to clean up any test patches on exit, but also do it now just in case
+sed -i '/^+ test\//d' debian/patches/"$series"
+trap "sed -i '/^+ test\//d' debian/patches/\"$series\"" EXIT
+
+# Append to patch series
 for patch in "$@"; do
-    echo "+ test/$(basename "$patch")${restrictfeature}" >>debian/patches/series/"$series"
+    echo "+ test/$(basename "$patch")" >>debian/patches/"$series"
 done
 
 # Regenerate control and included rules