From owner-svn-src-user@FreeBSD.ORG Wed Jun 13 10:42:55 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D130A106566C; Wed, 13 Jun 2012 10:42:55 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id A23758FC0A; Wed, 13 Jun 2012 10:42:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5DAgt7d012849; Wed, 13 Jun 2012 10:42:55 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5DAgtxi012847; Wed, 13 Jun 2012 10:42:55 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201206131042.q5DAgtxi012847@svn.freebsd.org> From: Doug Barton Date: Wed, 13 Jun 2012 10:42:55 +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: r237004 - 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: Wed, 13 Jun 2012 10:42:55 -0000 Author: dougb Date: Wed Jun 13 10:42:55 2012 New Revision: 237004 URL: http://svn.freebsd.org/changeset/base/237004 Log: Revert r237003 since it is needed to restore the terminal title during a long delay between -a ports to update. Add a comment so I don't forget. Also restore part of r236996, match >> for the in-line term_printf() code, and add that pattern in post_first_pass() where it's needed to match. Adjust the summary message in multiport() to suit. Arguably this is a more elegant way to present the information anyway. Don't bother trying to delete empty directories in WRKDIRPREFIX if we are exiting abnormally, chances are there will be a work directory from the failed port. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Wed Jun 13 09:07:41 2012 (r237003) +++ user/dougb/portmaster/portmaster Wed Jun 13 10:42:55 2012 (r237004) @@ -165,7 +165,7 @@ parent_exit () { /bin/unlink $f done - if [ -n "$PM_WRKDIRPREFIX" ]; then + if [ -n "$PM_WRKDIRPREFIX" -a -z "$1" ]; then pm_v ; count=0 while : ; do pgrep -qf 'make clean NOCLEANDEPENDS=ncd' || break @@ -2232,7 +2232,7 @@ check_fetch_only () { term_printf () { case "$1" in '') [ -n "$PM_MULTI_PORTS" ] && echo -e "\n===>>> ${PM_PARENT_PORT}" ;; - *\(*) echo -e "\n===>>> ${PM_PARENT_PORT}${1}" ;; + *\>\>*) echo -e "\n===>>> ${PM_PARENT_PORT}${1}" ;; esac [ -n "$PM_NO_TERM_TITLE" ] && return @@ -2323,6 +2323,8 @@ update_port () { fi if [ -n "$UPDATE_ALL" ]; then + # Fix terminal titlebar in case of a long delay between ports to update + term_printf " (${num_of_deps})" echo -e "\n===>>> Returning to update check of installed ports\n" elif [ -n "$PM_URB" ]; then return 0 @@ -2572,7 +2574,7 @@ post_first_pass () { local action if [ ${num_of_deps:-0} -gt 0 ]; then - term_printf " (${num_of_deps})" + term_printf " >> (${num_of_deps})" if [ -z "$PM_NO_CONFIRM" ]; then local answer @@ -2822,7 +2824,7 @@ multiport () { esac done numports=$num - PM_PARENT_PORT="Total parent ports: $numports Total dependencies:" + PM_PARENT_PORT="Total ports: $numports" if [ -n "$PM_URB" ]; then unset PM_URB ; PM_URB=pm_urb_post_first_pass