diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2007-07-08 06:35:35 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2007-07-08 06:35:35 +0000 |
| commit | 60536b36b20c0c8cec47e3bd26452fcd1baeab02 (patch) | |
| tree | f3a5aa735840e611839b2db9f54d73828a2e3d3d /ports-mgmt/portmaster | |
| parent | Fix build with gcc 4.2. (diff) | |
Bug Fixes
=========
1. If we are doing --show-work, don't launch background processes
that are only useful for real builds.
2. Fix a rather obscure bug that can only happen:
IFF you are doing an install of a new port, and
IFF you have a dependency "early" in the list with an +IGNOREME file, and
IFF you have one or more dependencies "late" in the list that are not
installed. The bug is a false positive on the +IGNOREME for the uninstalled
ports. The solution is to reset the "port to test for +IGNOREME file"
variable each time through the loop. This will usually be a noop, but it
costs almost nothing in any case.
Notes
Notes:
svn path=/head/; revision=195205
Diffstat (limited to 'ports-mgmt/portmaster')
| -rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index bf16dbc198c6..43a03e112dab 100644 --- a/ports-mgmt/portmaster/files/portmaster.sh.in +++ b/ports-mgmt/portmaster/files/portmaster.sh.in @@ -1,6 +1,6 @@ #!/bin/sh -# Local version: 1.181 +# Local version: 1.182 # $FreeBSD$ # Copyright (c) 2005-2007 Douglas Barton, All rights reserved @@ -629,6 +629,7 @@ echo "===>>> Skipping ${dep_port#$pd/} because it matches the pattern: *${EXCL}* fi done + ign_p='' cur_p=`iport_from_origin ${dep_port#$pd/}` if [ -n "$cur_p" ]; then upd_args=$cur_p @@ -1430,7 +1431,7 @@ for state in FORBIDDEN BROKEN IGNORE; do fi done -if [ "$$" -eq "$PARENT_PID" ]; then +if [ "$$" -eq "$PARENT_PID" -a -z "$SHOW_WORK" ]; then # Set the file name here so it's visible to the parent DI_FILES=`mktemp -t DI-FILES-$PARENT_PID` export DI_FILES @@ -1439,7 +1440,7 @@ if [ "$$" -eq "$PARENT_PID" ]; then fi # Do these things first time through, with or without 'make config' -if [ -z "$BUILDING" ]; then +if [ -z "$BUILDING" -a -z "$SHOW_WORK" ]; then dofetch () { echo "===>>> Launching 'make checksum' for $portdir in background" fetchlog=`mktemp -t fetchlog-${PARENT_PID}-${portdir##*/}` |