From owner-svn-src-user@FreeBSD.ORG Sat Jul 31 23:15:51 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE94C106566C; Sat, 31 Jul 2010 23:15:51 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id ADE168FC14; Sat, 31 Jul 2010 23:15:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6VNFpbw023514; Sat, 31 Jul 2010 23:15:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6VNFpgj023512; Sat, 31 Jul 2010 23:15:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201007312315.o6VNFpgj023512@svn.freebsd.org> From: Doug Barton Date: Sat, 31 Jul 2010 23:15:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210705 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2010 23:15:51 -0000 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%%|*} ;;