svn commit: r221186 - user/dougb/portmaster
Doug Barton
dougb at FreeBSD.org
Thu Apr 28 21:41:00 UTC 2011
Author: dougb
Date: Thu Apr 28 21:41:00 2011
New Revision: 221186
URL: http://svn.freebsd.org/changeset/base/221186
Log:
When doing -F + --packages* for an individual port, don't bail out before
we have checked the run dependencies
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Thu Apr 28 21:27:34 2011 (r221185)
+++ user/dougb/portmaster/portmaster Thu Apr 28 21:41:00 2011 (r221186)
@@ -3537,7 +3537,7 @@ notnewer () {
fi
fi # [ -n "$pm_package_time" ]
-if [ -z "$use_package" -a -z "$FETCH_ONLY" ]; then
+if [ -z "$use_package" ]; then
if [ -n "$PM_PACKAGES" ]; then
[ -z "$PM_NO_MAKE_CONFIG" ] && make_config
@@ -3579,11 +3579,10 @@ if [ -z "$use_package" -a -z "$FETCH_ONL
else
[ -z "$local_package" ] && {
fetch_package $latest_pv || fail "Fetch for ${latest_pv}.tbz failed"; }
- check_fetch_only Package
fi
-# Ignore if no old port exists
-if [ -n "$upg_port" -o -n "$ro_upg_port" ]; then
+# Ignore if no old port exists, or -F
+if [ -n "$upg_port" -o -n "$ro_upg_port" ] && [ -z "$FETCH_ONLY" ]; then
UPGRADE_PORT="${ro_upg_port:-$upg_port}"
UPGRADE_PORT_VER=`echo $UPGRADE_PORT | sed 's#.*-\(.*\)#\1#'`
export UPGRADE_PORT UPGRADE_PORT_VER
@@ -3635,6 +3634,7 @@ fi
if [ -z "$PM_THOROUGH" -a -z "$NO_DEP_UPDATES" ]; then
echo '' ; echo "===>>> Starting check for runtime dependencies"
dependency_check run-depends-list
+ [ -n "$use_package" ] && check_fetch_only Package
pm_cd_pd $portdir
fi
More information about the svn-src-user
mailing list