From owner-svn-src-user@FreeBSD.ORG Sun Oct 31 02:15:24 2010 Return-Path: <owner-svn-src-user@FreeBSD.ORG> 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 51D2A106566B; Sun, 31 Oct 2010 02:15:24 +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 40A0E8FC1A; Sun, 31 Oct 2010 02:15:24 +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 o9V2FOdS038651; Sun, 31 Oct 2010 02:15:24 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9V2FOAv038648; Sun, 31 Oct 2010 02:15:24 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201010310215.o9V2FOAv038648@svn.freebsd.org> From: Doug Barton <dougb@FreeBSD.org> Date: Sun, 31 Oct 2010 02:15:24 +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: r214582 - in user/dougb/portmaster: . files 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" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 31 Oct 2010 02:15:24 -0000 Author: dougb Date: Sun Oct 31 02:15:23 2010 New Revision: 214582 URL: http://svn.freebsd.org/changeset/base/214582 Log: Clarify the problem described in the PR: The -e option can only deal with one port at a time so update the docs to reflect that more clearly, and update the code to use the various return values of find_glob_dirs() to make it more clear if the user specifies a pattern that matches more than one. PR: ports/151824 Submitted by: Ben Grimm <freebsd-pr@bengrimm.net> Modified: user/dougb/portmaster/files/portmaster.8 user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/files/portmaster.8 ============================================================================== --- user/dougb/portmaster/files/portmaster.8 Sun Oct 31 01:57:13 2010 (r214581) +++ user/dougb/portmaster/files/portmaster.8 Sun Oct 31 02:15:23 2010 (r214582) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 8, 2010 +.Dd October 30, 2010 .Dt PORTMASTER 8 .Os .Sh NAME @@ -107,7 +107,7 @@ and/or multiple globs from /var/db/pkg .Fl [l|L] .Nm .Op Fl b [D|d] -.Fl e Ar name/glob of port directory in /var/db/pkg +.Fl e Ar name/glob of a single port directory in /var/db/pkg .Nm .Op Fl b [D|d] .Fl s @@ -468,8 +468,8 @@ requirements. list all installed ports by category .It Fl L list all installed ports by category, and search for updates -.It Fl e Ar name/glob of port directory in /var/db/pkg -expunge port using +.It Fl e Ar name/glob of a single port directory in /var/db/pkg +expunge a port using .Xr pkg_delete 1 , and optionally remove all distfiles. Calls Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Oct 31 01:57:13 2010 (r214581) +++ user/dougb/portmaster/portmaster Sun Oct 31 02:15:23 2010 (r214582) @@ -291,7 +291,7 @@ usage () { echo '' echo "${0##*/} -[l|L]" echo '' - echo "${0##*/} [-b D|d] -e <name/glob of port directory in $pdb>" + echo "${0##*/} [-b D|d] -e <name/glob of a single port directory in $pdb>" echo "${0##*/} [-b D|d] -s" echo '' echo "${0##*/} [--force-config|-G] [-aftv] -F" @@ -365,7 +365,7 @@ usage () { echo '-l list installed ports by category' echo '-L list installed ports by category, and search for updates' echo '' - echo '-e expunge a port via pkg_delete, and remove its distfiles' + echo '-e expunge a single port via pkg_delete, and remove its distfiles' echo '-s clean out stale ports that used to be depended on' echo '' echo '[--force-config|-G] [-aftv] -F fetch distfiles only' @@ -1907,12 +1907,14 @@ fi if [ -n "$EXPUNGE" ]; then if [ ! -d "$pdb/$EXPUNGE" ]; then - if find_glob_dirs $EXPUNGE; then - EXPUNGE=${glob_dirs#$pdb/} - unset glob_dirs - else - fail "No such directory/port: $pdb/$EXPUNGE" - fi + find_glob_dirs $EXPUNGE + case $? in + 1) fail "No such directory/port: $pdb/$EXPUNGE" ;; + 2) echo "===>>> $EXPUNGE matched multiple ports" + fail "The -e option works with only one port at a time" ;; + 0) EXPUNGE=${glob_dirs#$pdb/} + unset glob_dirs ;; + esac fi origin=`origin_from_pdb $EXPUNGE`