supported test category

git-svn-id: http://trac.vinelinux.org/repos/projects/vbootstrap/trunk@800 ec354946-7b23-47d6-9f5a-488ba84defc7

vbootstrap-vl.spec

@@ -1,7 +1,7 @@
 # This package is maintained on trac svn repository. Please do not change on local.
 # If you find a BUG, please report to Vine@vinelinux.org or mailing list or BTS.
 
-%define version 0.0.24
+%define version 0.0.25
 
 Summary: bootstrap scripts to create a basic Vine Linux system
 Summary(ja): Vine Linux の基本システムを作成するためのスクリプト
@@ -72,6 +72,11 @@ vbuilder は vbootstrap を利用して chroot 環境の構築し、
 
 
 %changelog
+* Xxx Yyy ZZ 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.25-1
+- updated vbuilder.sh.in
+  - supported "test" category
+- updated vbuilder-bash-completion.sh
+
 * Sun Apr 11 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.0.24-1
 - updated vbootstrap.sh.in (daisuke-san)
   - changed to cache /var/lib/apt/lists, /var/cache/apt/archives 

vbuilder-bash-completion.sh

@@ -47,7 +47,7 @@ _vbuilder()
 	    ;;
 
 	--category)
-	    local running="main main,proposed-updates main,plus main,plus,nonfree"
+	    local running="main proposed-updates,main plus,main nonfree,plus,main test,nonfree,plus,main test,plus,main test,main"
 	    COMPREPLY=( $(compgen -W "${running}" -- "${cur}") )
 	    ;;
 

vbuilder.sh.in

@@ -263,7 +263,9 @@ setup-vbuilder(){
     with_category_main=0
     with_category_plus=0
     with_category_nonfree=0
+    with_category_test=0
     with_category_proposed_updates=0
+    with_category_security=0
 }
 
 setup-vbootstrap(){
@@ -315,7 +317,7 @@ setup-vbootstrap(){
 	MAJOR_VERSION=$(echo ${VERSION} | sed -e "s/_i[0-9]86//")
 
 	## check apt categories
-	## The main category main is unconditionally permited
+	## "main" category is unconditionally permited
 	with_category_main=1
 	for cat in $(echo ${CATEGORIES} | sed -e "s/,/ /"g); do
 	    case $cat in
@@ -328,13 +330,25 @@ setup-vbootstrap(){
 		nonfree)
 		    with_category_nonfree=1
 		    ;;
+		test)
+                    ## "test" category only exists in VineSeed
+		    [ "${MAJOR_VERSION}" = "VineSeed" ] || \
+			Msg_NoSuchCategoryExists_$LOCALE ${cat} && exit 1
+		    with_category_test=1
+		    ;;
 		proposed-updates)
-                    ##!! 4.2 has no apt-sourceslist-proposed-updates packages
+                    ##!! "proposed-updates" category does not exist in 4.2
 		    [ "${MAJOR_VERSION}" = "4.2" ] && \
 			Msg_NoSuchCategoryExists_$LOCALE ${cat} && exit 1
 
 		    with_category_proposed_updates=1
 		    ;;
+		security)
+                    ## "security" category does not exist in VineSeed
+		    [ "${MAJOR_VERSION}" = "VineSeed" ] && \
+			Msg_NoSuchCategoryExists_$LOCALE ${cat} && exit 1
+		    with_category_security=1
+		    ;;
 		*)
 		    Msg_NoSuchCategoryExists_$LOCALE ${cat} && exit 1
 		    ;;
@@ -607,6 +621,8 @@ Build(){
     case ${MAJOR_VERSION} in
 	4.2)
 	    $__chroot_sh "sed -i -e 's/main plus updates nonfree *$/$(echo ${CATEGORIES} | sed -e "s/,/ /"g) updates/g' /etc/apt/sources.list"
+	    # [ $with_category_security -eq 1 ] && \
+	    # 	echo 
 	    ;;
 	@@VBUILDER_STABLE_VERSION@@)
 	    [ $with_category_plus -eq 1 ] && \
@@ -615,12 +631,16 @@ Build(){
 		$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-nonfree'
 	    [ $with_category_proposed_updates -eq 1 ] && \
 		$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-proposed-updates'
+	    # [ $with_category_security -eq 1 ] && \
+	    # 	echo 
 	    ;;
 	VineSeed)
 	    [ $with_category_plus -eq 1 ] && \
 		$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-plus'
 	    [ $with_category_nonfree -eq 1 ] && \
 		$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-nonfree'
+	    [ $with_category_test -eq 1 ] && \
+		$__chroot_sh 'apt-get -qq update && apt-get -qq -y install apt-sourceslist-test'
 	    ;;
     esac