svn commit: r215793 - user/dougb/portmaster
Doug Barton
dougb at FreeBSD.org
Wed Nov 24 06:22:09 UTC 2010
Author: dougb
Date: Wed Nov 24 06:22:09 2010
New Revision: 215793
URL: http://svn.freebsd.org/changeset/base/215793
Log:
Handle the multiport() case when a port that is a dependency
of an earlier port is up to date, and listed by PKGNAME.
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Wed Nov 24 05:50:19 2010 (r215792)
+++ user/dougb/portmaster/portmaster Wed Nov 24 06:22:09 2010 (r215793)
@@ -2611,17 +2611,21 @@ multiport () {
num=0
for port in $worklist; do
case "$port" in
- */*) case "$PM_NEEDS_UPDATE" in
- *\ $port\ *) ;; # Ok to proceed
- *) continue ;; # Already updated as a dependency
- esac ;;
+ */*) origin=$port ;;
*) # If an installed version does not exist at this
# point it probably got updated as a dependency
if [ ! -d "$pdb/$port" ]; then
numports=$(( $numports - 1 ))
continue
- fi ;;
+ fi
+ origin=`origin_from_pdb $port` ;;
esac
+
+ case "$PM_NEEDS_UPDATE" in
+ *\ $origin\ *) ;; # Ok to proceed
+ *) continue ;; # Already updated as a dependency
+ esac
+
num=$(( $num + 1 ))
init_term_printf "$port ${num}/${numports}"
($0 $ARGS $port) || fail "Update for $port failed"
More information about the svn-src-user
mailing list