Browse Source

Build() を修正。
vboostrap を実行したとき、外部のapt-line が内部のデフォルトapt-line updates.vinelinux.org と同じならば、'W: Duplicate sources.list entry...' が出ていたのを抑制するように変更。

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

munepi 12 years ago
parent
commit
31021a91f8
1 changed files with 7 additions and 2 deletions
  1. 7 2
      vbuilder.sh.in

+ 7 - 2
vbuilder.sh.in

@@ -586,13 +586,18 @@ Build(){
 	## make bootstrap of ${STABLE_VERSION}
 	/usr/sbin/vbootstrap \
 	    $(echo ${BASE_PROFILE} | sed -e "s/VineSeed/${STABLE_VERSION}/") \
-	    ${VBOOTSTRAP_FETCH_URL} ${BUILD_ROOT}
+	    ${VBOOTSTRAP_FETCH_URL} ${BUILD_ROOT} 2>&1 | \
+	    egrep -v -e '^W: Duplicate sources.list entry' \
+	             -e '^W: .*apt-get update'
 
 	## aim apt-line to VineSeed
 	sed -i "s/apt ${STABLE_VERSION}/apt VineSeed/g" \
 	    ${BUILD_ROOT}/etc/apt/sources.list.d/main.list
     else
-	/usr/sbin/vbootstrap ${BASE_PROFILE} ${VBOOTSTRAP_FETCH_URL} ${BUILD_ROOT}
+	/usr/sbin/vbootstrap \
+	    ${BASE_PROFILE} ${VBOOTSTRAP_FETCH_URL} ${BUILD_ROOT} 2>&1 | \
+	    egrep -v -e '^W: Duplicate sources.list entry' \
+	             -e '^W: .*apt-get update'
     fi
 
     mount-chroot /proc