From owner-svn-src-user@FreeBSD.ORG Mon May 10 03:13:23 2010 Return-Path: <owner-svn-src-user@FreeBSD.ORG> Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AF8D01065670; Mon, 10 May 2010 03:13:23 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 9FDC98FC19; Mon, 10 May 2010 03:13:23 +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 o4A3DNDX027335; Mon, 10 May 2010 03:13:23 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4A3DNcP027333; Mon, 10 May 2010 03:13:23 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005100313.o4A3DNcP027333@svn.freebsd.org> From: Doug Barton <dougb@FreeBSD.org> Date: Mon, 10 May 2010 03:13:23 +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: r207840 - 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: Mon, 10 May 2010 03:13:23 -0000 Author: dougb Date: Mon May 10 03:13:23 2010 New Revision: 207840 URL: http://svn.freebsd.org/changeset/base/207840 Log: Be smarter about whether or not to use $PM_SU_CMD to fetch the INDEX.bz2 Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon May 10 02:09:53 2010 (r207839) +++ user/dougb/portmaster/portmaster Mon May 10 03:13:23 2010 (r207840) @@ -518,9 +518,17 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then : ${FETCHINDEX:='fetch -am -o'} : ${MASTER_SITE_INDEX:='http://www.FreeBSD.org/ports/'} + index_fetch="$FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2" + do_index_fetch=yes_index_fetch + index_time=`stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` - pm_sv Updating INDEX file - $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 + + [ -n "$index_time" ] && { + $index_fetch 2>/dev/null && do_index_fetch=no_index_fetch; } + + [ "$do_index_fetch" = yes_index_fetch ] && { + pm_sv 'Updating INDEX file'; $PM_SU_CMD $index_fetch; } + if [ ${index_time:-0} -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then temp_index=`pm_mktemp index` bunzip2 < ${PM_INDEX}.bz2 > $temp_index @@ -528,7 +536,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then unlink $temp_index unset temp_index fi - unset index_time + unset index_fetch do_index_fetch index_time else [ -r "$PM_INDEX" ] || fail "The --no-index-fetch option was used, but $PM_INDEX does not exist"