From owner-svn-src-user@FreeBSD.ORG Sun Dec 6 21:42:25 2009
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 D78FF10656A3;
Sun, 6 Dec 2009 21:42:25 +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 AD7578FC0A;
Sun, 6 Dec 2009 21:42:25 +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 nB6LgP2p032446;
Sun, 6 Dec 2009 21:42:25 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB6LgPSI032444;
Sun, 6 Dec 2009 21:42:25 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912062142.nB6LgPSI032444@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 6 Dec 2009 21:42:25 +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: r200187 - 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, 06 Dec 2009 21:42:25 -0000
Author: dougb
Date: Sun Dec 6 21:42:25 2009
New Revision: 200187
URL: http://svn.freebsd.org/changeset/base/200187
Log:
Rather than repeat all the tests for when NOT to run read_distinfos()
each time, depend on the tests for creating $DI_FILES then test for its
existence.
In fetch_packages() don't run all the code for finding out packages, etc.
unless $ppd is actually unset.
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Sun Dec 6 21:07:47 2009 (r200186)
+++ user/dougb/portmaster/portmaster Sun Dec 6 21:42:25 2009 (r200187)
@@ -2019,10 +2019,8 @@ all_config () {
CONFIG_SEEN_LIST="${CONFIG_SEEN_LIST}${origin}:"
done
}
- if [ -z "$DONT_SCRUB_DISTFILES" -a -z "$FETCH_ONLY" \
- -a -z "$PM_PACKAGES" ]; then
- (read_distinfos)&
- fi
+ [ -n "$DI_FILES" ] && (read_distinfos)&
+
ports_by_category
echo "===>>> Starting check of installed ports for available updates"
@@ -2236,10 +2234,8 @@ check_state || {
safe_exit 1; }
# Do not start this in the background until we are sure we are going to build
-if [ "$$" -eq "$PM_PARENT_PID" -a -z "$SHOW_WORK" -a -z "$PM_PACKAGES" \
- -a -z "$DONT_SCRUB_DISTFILES" -a -z "$FETCH_ONLY" ]; then
- echo ''; (read_distinfos)&
-fi
+[ "$$" -eq "$PM_PARENT_PID" -a -n "$DI_FILES" ] && {
+ echo ''; (read_distinfos)& }
# Do these things first time through, with or without 'make config'
if [ -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then
@@ -2415,16 +2411,18 @@ if [ -n "$PM_PACKAGES" -o "$PM_PACKAGES_
fetch_package () {
local do_fetch
- # Duplicated from pkg_init()
- [ -z "$packages" ] &&
+ if [ -z "$ppd" ]; then
+ # Duplicated from pkg_init()
+ [ -z "$packages" ] &&
packages=`pm_make -f/usr/share/mk/bsd.port.mk -V PACKAGES`
- [ -n "$packages" ] || fail 'The value of PACKAGES cannot be empty'
-
- [ -z "$ppd" ] && { ppd=$packages/portmaster-download; export ppd; }
+ [ -n "$packages" ] ||
+ fail 'The value of PACKAGES cannot be empty'
+ ppd=$packages/portmaster-download
+ export ppd
+ fi
if [ ! -d "$ppd" ]; then
- [ -n "$PM_SU_VERBOSE" ] &&
- echo "===>>> Creating $ppd"
+ [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Creating $ppd"
pm_mkdir_s $ppd
fi