svn commit: r238611 - user/dougb/portmaster
Doug Barton
dougb at FreeBSD.org
Thu Jul 19 08:42:32 UTC 2012
Author: dougb
Date: Thu Jul 19 08:42:31 2012
New Revision: 238611
URL: http://svn.freebsd.org/changeset/base/238611
Log:
Removing $ALL_FETCH was a mistake because the reason it existed previously
is that $UPDATE_ALL cannot be exported to the children. So bring it back
as $PM_ALL_FETCH.
This is basically a cosmetic bug which will only show up when using -Faf
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Thu Jul 19 05:34:19 2012 (r238610)
+++ user/dougb/portmaster/portmaster Thu Jul 19 08:42:31 2012 (r238611)
@@ -2347,9 +2347,8 @@ update_port () {
dep_of_deps=$(( $dep_of_deps + 1 ))
- [ -n "$PM_FIRST_PASS" ] &&
- [ ! \( -n "$PM_FORCE" -a -n "$FETCH_ONLY" -a -n "$UPDATE_ALL" \) ] &&
- num_of_deps=$(( $num_of_deps + 1 ))
+ [ -n "$PM_FIRST_PASS" ] && [ ! \( -n "$PM_FORCE" -a -n "$PM_ALL_FETCH" \) ] &&
+ num_of_deps=$(( $num_of_deps + 1 ))
deps="(${dep_of_deps}/${num_of_deps})"
@@ -3059,7 +3058,11 @@ all_first_pass () {
[ -n "$DI_FILES" ] && (read_distinfos)&
ports_by_category
- [ -n "$FETCH_ONLY" -a -n "$PM_FORCE" ] && $num_of_deps=$num_ports
+ if [ -n "$FETCH_ONLY" ]; then
+ # UPDATE_ALL is not exported
+ export PM_ALL_FETCH=pm_all_fetch
+ [ -n "$PM_FORCE" ] && num_of_deps=$num_ports
+ fi
unset num_ports
init_term_printf All
@@ -3340,7 +3343,7 @@ if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUIL
TESTINT=`grep -l ^IS_INTERACTIVE Makefile` &&
TESTINT=`pm_make_b -V IS_INTERACTIVE`
else
- [ -n "$UPDATE_ALL" -a -n "$FETCH_ONLY" ] && safe_exit
+ [ -n "$PM_ALL_FETCH" ] && safe_exit
fi
if [ -n "$TESTINT" ]; then
echo ''
More information about the svn-src-user
mailing list