diff options
| author | dougb <dougb@FreeBSD.org> | 2007-10-21 05:33:07 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2007-10-21 05:33:07 +0000 |
| commit | 4b48308dea512c36a0b134b3f6227a16404d41e0 (patch) | |
| tree | 4ed4081133fb7cc2eb6e810150366cf1cab50927 /ports-mgmt | |
| parent | 1986a2244bd7377e7badd5ab4cab54cbcba260fb (diff) | |
| download | FreeBSD-ports-4b48308dea512c36a0b134b3f6227a16404d41e0.zip FreeBSD-ports-4b48308dea512c36a0b134b3f6227a16404d41e0.tar.gz | |
Two small bug fixes
===================
1. When I changed how the MOVED file was treated in version 1.19
I accidentally typed a literal /usr/ports/. Change that to the
variable for PORTSDIR as it should be. [1]
2. When using the --show-work feature and the port has no dependencies,
exit immediately instead of recursing.
Submitted by: Jason C. Wells <jcw@highperformance.net> [1]
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/files/portmaster.sh.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ports-mgmt/portmaster/files/portmaster.sh.in b/ports-mgmt/portmaster/files/portmaster.sh.in index a3a3b90..8cdb3dd 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.190 +# Local version: 1.191 # $FreeBSD$ # Copyright (c) 2005-2007 Douglas Barton, All rights reserved @@ -513,7 +513,7 @@ find_moved_port () { # To avoid having each word of the reason treated separately IFS=' ' - for l in `grep "^$sf" /usr/ports/MOVED`; do + for l in `grep "^$sf" $pd/MOVED`; do case "$l" in ${sf}\|\|*) fail "The $sf port has been deleted: ${l##*|}" ;; @@ -571,6 +571,7 @@ dependency_check () { if [ -z "$dep_port_list" ]; then echo "===>>> No dependencies for $portdir" + [ -n "$SHOW_WORK" ] && safe_exit return 0 else if [ -n "$CONFIG_ONLY" ]; then |
