[PC-BSD Commits] r13762 - pcbsd/current/src-sh/pbi-manager

[svn at pcbsd.org]

Author: kris
Date: 2011-11-09 08:36:36 -0800 (Wed, 09 Nov 2011)
New Revision: 13762

Modified:
   pcbsd/current/src-sh/pbi-manager/pbi-manager
Log:

Add -a flag to fetch commands in pbi-manager to avoid soft transfer failures




Modified: pcbsd/current/src-sh/pbi-manager/pbi-manager
===================================================================
--- pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-09 16:13:58 UTC (rev 13761)
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-11-09 16:36:36 UTC (rev 13762)
@@ -4780,7 +4780,7 @@
 		_upURL="${_rURL}"
 	fi
 
-	fetch -o "${_tmpPbiIndex}.bz2" "${_upURL}/${PBI_INDEXUPFILE}.bz2" >/dev/null 2>/dev/null
+	fetch -a -o "${_tmpPbiIndex}.bz2" "${_upURL}/${PBI_INDEXUPFILE}.bz2" >/dev/null 2>/dev/null
 	if [ "$?" != "0" ] ; then
 		return
 	fi
@@ -4797,7 +4797,7 @@
  	sleep 1
 
 	# Now check for an optional meta file update
-	fetch -o "${_tmpPbiMeta}.bz2" "${_upURL}/${PBI_METAUPFILE}.bz2" >/dev/null 2>/dev/null
+	fetch -a -o "${_tmpPbiMeta}.bz2" "${_upURL}/${PBI_METAUPFILE}.bz2" >/dev/null 2>/dev/null
 	if [ "$?" = "0" ] ; then
 		bzip2 -d "${_tmpPbiMeta}.bz2" >/dev/null 2>/dev/null
 		if [ "$?" = "0" ] ; then
@@ -4846,7 +4846,7 @@
 
 		# Now fetch the file
 		sFile="${PBI_DBICONDIR}/${_repoMd5}-${iName}.${ext}"
-		fetch -o "${sFile}" "${aIcon}" >/dev/null 2>/dev/null
+		fetch -a -o "${sFile}" "${aIcon}" >/dev/null 2>/dev/null
 		
 		# Wait a sec
 		sleep 1
@@ -5177,17 +5177,17 @@
 	if [ -e "${_lf}" ] ; then rm "$_lf" ; fi
 
 	if [ "$PBI_FETCH_PARSING" != "YES" ] ; then
-		fetch -o "${_lf}" "${_rf}"
+		fetch -a -o "${_lf}" "${_rf}"
 		_err=$?
 	else
 		# Doing a front-end download, parse the output of fetch
 		_eFile="${PBI_TMPDIR}/.fetch-exit.$$"
-		fetch -s "${_rf}" > ${PBI_TMPDIR}/.fetch-size.$$ 2>/dev/null
+		fetch -a -s "${_rf}" > ${PBI_TMPDIR}/.fetch-size.$$ 2>/dev/null
 		_fSize=`cat ${PBI_TMPDIR}/.fetch-size.$$ 2>/dev/null`
 		_fSize="`expr ${_fSize} / 1024 2>/dev/null`"
 		rm "${PBI_TMPDIR}/.fetch-size.$$" 2>/dev/null
 
-		( fetch -o "${_lf}" "${_rf}" >/dev/null 2>/dev/null ; echo "$?" > ${_eFile} ) &
+		( fetch -a -o "${_lf}" "${_rf}" >/dev/null 2>/dev/null ; echo "$?" > ${_eFile} ) &
 		FETCH_PID="$!"
 		while
 		z=1
@@ -6153,8 +6153,8 @@
 
   	  # To fetch the jail environment
  	  echo "Fetching FreeBSD chroot environment... This may take a while..."
-  	  fetch -o rel.tbz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz
-    	  fetch -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz.md5
+  	  fetch -a -o rel.tbz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz
+    	  fetch -a -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.tbz.md5
 
     	  if [ `md5 -q rel.tbz` != `cat rel.md5` ] ; then
     	    exit_err "Error in download data, checksum mismatch.. Please try again later."