Date: Sun, 11 Apr 2010 21:59:23 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r206493 - user/dougb/portmaster Message-ID: <201004112159.o3BLxNXT023026@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Sun Apr 11 21:59:23 2010 New Revision: 206493 URL: http://svn.freebsd.org/changeset/base/206493 Log: When NOT using --index-only the rundep list still needs to be parsed the old way. So only add spaces to the list if we're generating it from the INDEX, and let the case statement match with or without a space. Reported by: avilla Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Apr 11 21:22:02 2010 (r206492) +++ user/dougb/portmaster/portmaster Sun Apr 11 21:59:23 2010 (r206493) @@ -1998,6 +1998,8 @@ gen_dep_list () { for l in $temp_list ; do list="$list `grep -m1 ^${l}\| $PM_INDEX | cut -f 2 -d \|`" done + + list=" $list " fi echo "$list" @@ -2031,11 +2033,11 @@ dependency_check () { if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then local rundeps dep varname run_dl build_only_dl - rundeps=" `gen_dep_list run-depends-list` " + rundeps=`gen_dep_list run-depends-list` for dep in $d_port_list; do case "$rundeps" in - *" ${dep} "*) + *" ${dep} "*|*${dep}*) varname=`echo ${dep#$pd/} | sed 's#[-+/\.]#_#g'` rundep_list="$rundep_list $varname" eval $varname=\"$portdir \$$varname\"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004112159.o3BLxNXT023026>