svn commit: r210705 - user/dougb/portmaster

[Doug Barton]

Author: dougb
Date: Sat Jul 31 23:15:51 2010
New Revision: 210705
URL: http://svn.freebsd.org/changeset/base/210705

Log:
  Make parse_index() more forgiving of PORTSDIR != /usr/ports

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Jul 31 21:35:15 2010	(r210704)
+++ user/dougb/portmaster/portmaster	Sat Jul 31 23:15:51 2010	(r210705)
@@ -1020,11 +1020,9 @@ init_packages_var () {
 }
 
 parse_index () {
-	local pd line
+	local line
 
-	[ -z "$pd" -a -n "$PM_INDEX_ONLY" ] && pd=/usr/ports
-
-	line=`grep -m1 .*\|${pd}/${1}\|.* $PM_INDEX` || return 1
+	line=`grep -m1 .*\|.*/${1}\|.* $PM_INDEX` || return 1
 
 	case "$2" in
 	name)		echo ${line%%|*} ;;