From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 08:35:35 2009 Return-Path: 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 96EDB106566C; Fri, 18 Dec 2009 08:35:35 +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 1D22D8FC18; Fri, 18 Dec 2009 08:35:35 +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 nBI8ZZgd080903; Fri, 18 Dec 2009 08:35:35 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI8ZYHR080901; Fri, 18 Dec 2009 08:35:34 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180835.nBI8ZYHR080901@svn.freebsd.org> From: Doug Barton Date: Fri, 18 Dec 2009 08:35:34 +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: r200664 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 08:35:35 -0000 Author: dougb Date: Fri Dec 18 08:35:34 2009 New Revision: 200664 URL: http://svn.freebsd.org/changeset/base/200664 Log: Collect common post-config code related to build-only options into post_config() Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 08:03:31 2009 (r200663) +++ user/dougb/portmaster/portmaster Fri Dec 18 08:35:34 2009 (r200664) @@ -1868,8 +1868,6 @@ create_master_rb_list () { post_config () { local action - unset CONFIG_SEEN_LIST CONFIG_ONLY - action=build if [ "$PM_PACKAGES" = only ]; then action=install @@ -1880,6 +1878,13 @@ post_config () { echo '' echo "===>>> Starting $action for $* <<<===" echo '' + + unset CONFIG_SEEN_LIST CONFIG_ONLY + + if [ -n "$PM_BUILD_ONLY_LIST" ]; then + unset run_dl_g + PM_BUILD_ONLY_LIST=pm_bol + fi } multiport () { @@ -1947,11 +1952,6 @@ multiport () { check_fetch_only post_config multiple ports - - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi fi export PM_BUILDING=pmbuildingmultiport @@ -2116,11 +2116,7 @@ all_config () { post_config for ports that need updating - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - clean_build_only_list - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi + [ -n "$PM_BUILD_ONLY_LIST" ] && clean_build_only_list fi export PM_BUILDING=pmbuildingall @@ -2420,11 +2416,6 @@ if [ -n "$CONFIG_ONLY" ]; then check_fetch_only post_config $portdir - - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi fi [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain