From owner-svn-src-user@FreeBSD.ORG Sun Feb 14 22:10:07 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B25D81065676;
Sun, 14 Feb 2010 22:10:07 +0000 (UTC)
(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A2A6C8FC0C;
Sun, 14 Feb 2010 22:10:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1EMA7eI099923;
Sun, 14 Feb 2010 22:10:07 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1EMA7Gh099922;
Sun, 14 Feb 2010 22:10:07 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201002142210.o1EMA7Gh099922@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 14 Feb 2010 22:10:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r203907 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Feb 2010 22:10:07 -0000
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