From owner-svn-src-user@FreeBSD.ORG Thu Apr 7 00:30:33 2011 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 1C929106564A; Thu, 7 Apr 2011 00:30:33 +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 0F25A8FC15; Thu, 7 Apr 2011 00:30:33 +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 p370UW3o023530; Thu, 7 Apr 2011 00:30:32 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p370UW3S023528; Thu, 7 Apr 2011 00:30:32 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104070030.p370UW3S023528@svn.freebsd.org> From: Doug Barton Date: Thu, 7 Apr 2011 00:30:32 +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: r220405 - 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: Thu, 07 Apr 2011 00:30:33 -0000 Author: dougb Date: Thu Apr 7 00:30:32 2011 New Revision: 220405 URL: http://svn.freebsd.org/changeset/base/220405 Log: micro-optimize check_for_updates() a little more by only checking the existence of the origin directory if necessary. In multiport() don't test for the existence of the origin directory if PM_INDEX_ONLY is set. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Wed Apr 6 23:59:59 2011 (r220404) +++ user/dougb/portmaster/portmaster Thu Apr 7 00:30:32 2011 (r220405) @@ -1537,7 +1537,7 @@ check_for_updates () { [ -n "$PM_INDEX_FIRST" ] || skip=index_skip fi - if [ -d "$pd/$origin" -a -z "$do_update" -a -z "$skip" ]; then + if [ -z "$do_update" -a -z "$skip" ] && [ -d "$pd/$origin" ]; then if ! pm_cd $pd/$origin; then if [ -e "$pdb/$iport/+IGNOREME" ]; then echo " ===>>> Warning: Unable to cd to $pd/$origin" @@ -2606,7 +2606,7 @@ multiport () { port=${port#$pdb/} case "$port" in */*) port=${port#$pd/} - if [ -d "$pd/${port}" ]; then + if [ -n "$PM_INDEX_ONLY" ] || [ -d "$pd/${port}" ]; then worklist_temp="$worklist_temp $port" else fail "$pd/${port} does not exist" From owner-svn-src-user@FreeBSD.ORG Sat Apr 9 06:01:37 2011 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 6CF24106564A; Sat, 9 Apr 2011 06:01:37 +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 5CAA58FC0C; Sat, 9 Apr 2011 06:01:37 +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 p3961boT003035; Sat, 9 Apr 2011 06:01:37 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3961bLh003033; Sat, 9 Apr 2011 06:01:37 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104090601.p3961bLh003033@svn.freebsd.org> From: Doug Barton Date: Sat, 9 Apr 2011 06:01:37 +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: r220464 - 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, 09 Apr 2011 06:01:37 -0000 Author: dougb Date: Sat Apr 9 06:01:37 2011 New Revision: 220464 URL: http://svn.freebsd.org/changeset/base/220464 Log: Add some code to --check-depends to explicitly handle --index-only. It worked before by ignoring the origin test if there was no ports directory, but failed if --index-only was also used. This is better both because it doesn't fail with --index-only, but also because it now uses the index to validate $origin. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Apr 9 02:22:49 2011 (r220463) +++ user/dougb/portmaster/portmaster Sat Apr 9 06:01:37 2011 (r220464) @@ -1386,9 +1386,17 @@ IFS=' origin=`origin_from_pdb $iport` || continue - if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then + if [ -z "$PM_INDEX_ONLY" ]; then + if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then + missing=yes + fi + else + parse_index $origin name >/dev/null || missing=yes + fi + if [ -n "$missing" ]; then echo " ===>>> $pd/$origin does not exist" echo " ===>>> This port should probably be updated" + unset missing continue fi