svn commit: r238681 - user/dougb/portmaster
Doug Barton
dougb at FreeBSD.org
Sun Jul 22 09:04:27 UTC 2012
Author: dougb
Date: Sun Jul 22 09:04:26 2012
New Revision: 238681
URL: http://svn.freebsd.org/changeset/base/238681
Log:
Simplify update_build_l(). Nowadays when we call it we always know the
origin, and if the port is installed we don't need to search for either
Modified:
user/dougb/portmaster/portmaster
Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster Sun Jul 22 07:52:58 2012 (r238680)
+++ user/dougb/portmaster/portmaster Sun Jul 22 09:04:26 2012 (r238681)
@@ -2292,26 +2292,21 @@ update_pm_nu () {
update_build_l () {
local origin iport new_port
- case "$1" in
- */*) origin=$1
- update_pm_nu $origin
- [ -n "$PM_NO_CONFIRM" ] && return
- case "$build_l" in *\ $origin\\*) return ;; esac
- iport=`iport_from_origin $origin`
- if [ -z "$iport" ]; then
- build_l="${build_l}\tInstall $origin\n"
- return
- fi ;;
- *) iport=$1
- origin=`origin_from_pdb $1`
- update_pm_nu $origin
- case "$build_l" in *\ $iport\ *|*\ $iport\\*) return ;; esac ;;
- esac
+ origin=$1 ; update_pm_nu $origin
[ -n "$PM_NO_CONFIRM" ] && return
- if [ -z "$PM_INDEX_ONLY" ]; then
- pm_cd $pd/$origin && new_port=`pm_make -V PKGNAME`
+ if [ -z "$2" ]; then
+ case "$build_l" in *\ $origin\\*) return ;; esac
+ build_l="${build_l}\tInstall $origin\n"
+ return
+ else
+ iport=$2
+ case "$build_l" in *\ $iport\ *|*\ $iport\\*) return ;; esac
+ fi
+
+ if pm_cd_pd $origin; then
+ new_port=`pm_make -V PKGNAME`
else
new_port=`parse_index $origin name` ||
fail "No entry for $origin in $PM_INDEX"
@@ -3291,11 +3286,7 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_O
fi
fi
- if [ -n "$upg_port" ]; then
- update_build_l $upg_port
- else
- update_build_l $portdir
- fi
+ update_build_l $portdir $upg_port
elif [ -n "$FETCH_ONLY" -a -n "$PM_PACKAGES" ]; then
update_pm_nu $portdir
fi
More information about the svn-src-user
mailing list