From owner-cvs-ports@FreeBSD.ORG Wed Nov 10 03:30:28 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 997F5106566B; Wed, 10 Nov 2010 03:30:28 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89A858FC1A; Wed, 10 Nov 2010 03:30:28 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id oAA3USMX064586; Wed, 10 Nov 2010 03:30:28 GMT (envelope-from dougb@repoman.freebsd.org) Received: (from dougb@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id oAA3USBq064585; Wed, 10 Nov 2010 03:30:28 GMT (envelope-from dougb) Message-Id: <201011100330.oAA3USBq064585@repoman.freebsd.org> From: Doug Barton Date: Wed, 10 Nov 2010 03:30:28 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/ports-mgmt/portmaster Makefile distinfo X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2010 03:30:28 -0000 dougb 2010-11-10 03:30:28 UTC FreeBSD ports repository Modified files: ports-mgmt/portmaster Makefile distinfo Log: Bug Fixes ========= 1. Since $build_l is no longer being incremented prior to the user's +IGNOREME decision it's no longer necessary to decrement it if the user chooses not to update that port. 2. While I was reading the trace to find this bug I noticed that we are running update_build_l() (which in turn updates PM_NEEDS_UPDATE) prior to running check_state() (FORBIDDEN|DEPRECATED|BROKEN|IGNORE), so move that check up; and move the "currently installed" and "port directory" messages up as well to give context to any messages from check_state(). 3. Only print the fast-resume message if we're building. Otherwise we might not know all the ports that need updating. 4. Fix the zsh completion file for --clean-packages[-all] Minor Fixes =========== 1. In read_distinfos_all() a missing DISTINFO_FILE doesn't need to be fatal like it does in read_distinfos() since it could be caused by something uninteresting like a MASTERDIR that exists in part of the tree that has not been downloaded (e.g., a c[v]sup refuse file). Add some whitespace around the message in case make also emits an error. 2. For --clean-distfiles* add a line after the "Checking" message to make the spacing consistent 3. In usage() fill in $pd if it's empty (which it will be for -h|--help) 4. Give a more helpful error message for -o when the port to be replaced isn't installed or listed as a dependency Revision Changes Path 2.37 +1 -1 ports/ports-mgmt/portmaster/Makefile 2.5 +4 -4 ports/ports-mgmt/portmaster/distinfo