Date: Sun, 14 Feb 2010 22:10:07 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r203907 - user/dougb/portmaster Message-ID: <201002142210.o1EMA7Gh099922@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sun Feb 14 22:10:06 2010 New Revision: 203907 URL: http://svn.freebsd.org/changeset/base/203907 Log: The path/name of the local INDEX file needs to be persistent so it can be used later. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Feb 14 20:10:41 2010 (r203906) +++ user/dougb/portmaster/portmaster Sun Feb 14 22:10:06 2010 (r203907) @@ -2238,15 +2238,16 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S fail 'The value of INDEXFILE cannot be empty' fi - i="${INDEXDIR}/${INDEXFILE}" + PM_INDEX="${INDEXDIR}/${INDEXFILE}" + export PM_INDEX - [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Fetching INDEX file" - $PM_SU_CMD $FETCHINDEX ${i}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 + [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Updating INDEX file" + $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 temp_index=`pm_mktemp index` - bunzip2 < ${i}.bz2 > $temp_index + bunzip2 < ${PM_INDEX}.bz2 > $temp_index pm_install_s $temp_index $i - unset i temp_index + unset temp_index fi if [ $# -gt 1 -a -z "$REPLACE_ORIGIN" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002142210.o1EMA7Gh099922>