[kernel] r16459 - dists/sid/linux-2.6/debian/bin

[Ben Hutchings]

Author: benh
Date: Tue Oct 19 02:25:01 2010
New Revision: 16459

Log:
Also apply the featureset restriction if the featureset is auto-detected

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

Modified: dists/sid/linux-2.6/debian/bin/test-patches
==============================================================================
--- dists/sid/linux-2.6/debian/bin/test-patches	Tue Oct 19 02:19:51 2010	(r16458)
+++ dists/sid/linux-2.6/debian/bin/test-patches	Tue Oct 19 02:25:01 2010	(r16459)
@@ -19,14 +19,12 @@
     featureset=none
 fi
 
-restrictfeature=
-
 eval "set -- $(getopt -n "$0" -- "f:j:s:" "$@")"
 while true; do
     case "$1" in
 	-f) flavour="$2"; shift 2 ;;
 	-j) export DEBIAN_KERNEL_JOBS="$2"; shift 2 ;;
-	-s) featureset="$2"; restrictfeature=" featureset=$2"; shift 2 ;;
+	-s) featureset="$2"; shift 2 ;;
 	--) shift 1; break ;;
     esac
 done
@@ -56,9 +54,11 @@
     version="$version"a~test
     dch -v "$version" --distribution UNRELEASED "Testing patches $*"
 fi
-series="${version##*-}"
 
-if [ "$restrictfeature" != "" ]; then
+restrictfeature=
+series="${version##*-}"
+if [ "$featureset" != none ]; then
+    restrictfeature=" featureset=$featureset"
     series="${series}-extra"
 fi