Date: Tue, 28 Dec 2010 19:22:53 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r216770 - user/dougb/portmaster Message-ID: <201012281922.oBSJMrXv074627@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Tue Dec 28 19:22:53 2010 New Revision: 216770 URL: http://svn.freebsd.org/changeset/base/216770 Log: Fix the discovery of WRKDIRPREFIX so that it works with multiport() and -a Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Tue Dec 28 18:58:15 2010 (r216769) +++ user/dougb/portmaster/portmaster Tue Dec 28 19:22:53 2010 (r216770) @@ -790,6 +790,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fi if [ -n "$pd" ]; then + pm_cd_pd && PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` export pd else if [ -n "$EXPUNGE" -o -n "$CLEAN_STALE" ]; then @@ -3051,11 +3052,7 @@ fi # Do these things first time through if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then # Do not start this in the background until we are sure we are going to build - if [ "$$" -eq "$PM_PARENT_PID" ]; then - [ -n "$DI_FILES" ] && (read_distinfos)& - - PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` - fi + [ "$$" -eq "$PM_PARENT_PID" -a -n "$DI_FILES" ] && (read_distinfos)& # Handle the problem of manual fetching [ -z "$PM_PACKAGES" ] && master_sites=`pm_make -V MASTER_SITES`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012281922.oBSJMrXv074627>