From owner-svn-src-user@FreeBSD.ORG Sun Apr 10 18:36:25 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 286E81065675; Sun, 10 Apr 2011 18:36:25 +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 191398FC26; Sun, 10 Apr 2011 18:36:25 +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 p3AIaOvw056101; Sun, 10 Apr 2011 18:36:24 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3AIaOGV056099; Sun, 10 Apr 2011 18:36:24 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104101836.p3AIaOGV056099@svn.freebsd.org> From: Doug Barton Date: Sun, 10 Apr 2011 18:36: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: r220528 - 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: Sun, 10 Apr 2011 18:36:25 -0000 Author: dougb Date: Sun Apr 10 18:36:24 2011 New Revision: 220528 URL: http://svn.freebsd.org/changeset/base/220528 Log: More fixes to --index-only, with or without a ports tree present, including better handling of --index-only in the rc file. * Don't do the work of handling the INDEX file if we won't need it anyway (-l, --list-origins, -e, -s) * Reorganize the final check of $pd (PORTSDIR) to properly handle the various combinations * Apply the same fix for $portsdir in -o that we did for multiport() * Since --check-depends now works with --index-only, update usage() Also: * Add a few more comments to the final fi of some long blocks * In multiport(), set missing=missing to aid debugging * Add some whitespace to the "Installing new +CONTENTS" message * In --clean-packages show the path in the delete prompt for stale packages that are not installed like we do for ones that are * In --check-port-dbdir simplify creation of the list of unique names Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Apr 10 18:35:43 2011 (r220527) +++ user/dougb/portmaster/portmaster Sun Apr 10 18:36:24 2011 (r220528) @@ -385,7 +385,7 @@ usage () { echo '' echo "${0##*/} [-n|y] [--index|--index-only] --clean-packages" echo '' - echo "${0##*/} [-n|y] [-v] --check-depends" + echo "${0##*/} [-n|y] [--index|--index-only] [-v] --check-depends" echo '' echo "${0##*/} [-n|y] [-v] --check-port-dbdir" echo '' @@ -745,7 +745,8 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fail Package installation support requires FreeBSD 6.4 or newer fi - if [ -n "$PM_INDEX" ]; then + if [ -n "$PM_INDEX" ] && + [ -z "$LIST" -a -z "$LIST_ORIGINS" -a -z "$EXPUNGE" -a -z "$CLEAN_STALE" ]; then if [ -z "$INDEXFILE" ]; then ver=`uname -r` INDEXFILE=INDEX-${ver%%\.*} @@ -818,19 +819,23 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then PM_IPD=$pd fi export PM_IPD - fi + fi # [ -n "$PM_INDEX" ] - if [ -n "$pd" ]; then - export pd + if [ -z "$EXPUNGE" -a -z "$CLEAN_STALE" ]; then + if [ -n "$pd" ]; then + export pd + elif [ -z "$LIST" -a -z "$LIST_ORIGINS" ]; then + fail 'The value of PORTSDIR cannot be empty' + fi else - if [ -n "$EXPUNGE" -o -n "$CLEAN_STALE" ]; then + if [ -n "$pd" ] && [ -d "$pd" ]; then + export pd + else if [ -z "$DONT_SCRUB_DISTFILES" ]; then pm_v "===>>> There is no ports tree, so using -D option" unset ALWAYS_SCRUB_DISTFILES DONT_SCRUB_DISTFILES=Dopt_es; ARGS="-D $ARGS" fi - elif [ -z "$LIST" -a -z "$LIST_PLUS" -a -z "$LIST_ORIGINS" -a -z "$CHECK_DEPENDS" ]; then - fail 'The value of PORTSDIR cannot be empty' fi fi @@ -844,7 +849,7 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then PM_BUILD_ONLY_LIST=pm_bol export PM_BUILD_ONLY_LIST fi -fi +fi # [ "$$" -eq "$PM_PARENT_PID" ] #=============== Begin functions relevant to --features and main =============== @@ -1045,7 +1050,7 @@ IFS=' check_regular_file $contents [ -n "$PM_VERBOSE" -o -n "$CHECK_DEPENDS" ] && - echo " ===>>> Installing the new +CONTENTS file" + { echo " ===>>> Installing the new +CONTENTS file" ; echo ''; } pm_install_s $new_cont $contents pm_unlink $new_cont } @@ -1311,6 +1316,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then if [ -z "$PM_YES" ]; then if [ ! -d "${pdb}/${pkg_dir}" ]; then echo " ===>>> $pkg_dir is not installed" + echo " ===>>> Path: ${package}" get_answer_yn y " ===>>> Delete stale package: ${package##*/}" case "$?" in 0) echo " ===>>> Deleting $package" @@ -1388,10 +1394,10 @@ IFS=' if [ -z "$PM_INDEX_ONLY" ]; then if [ -n "$pd" ] && [ ! -d "$pd/$origin" ]; then - missing=yes + missing=missing fi else - parse_index $origin name >/dev/null || missing=yes + parse_index $origin name >/dev/null || missing=missing fi if [ -n "$missing" ]; then echo " ===>>> $pd/$origin does not exist" @@ -1432,8 +1438,6 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then for pkg in $pdb/*; do [ -d $pkg ] || continue - unset unique_name - iport=${pkg#$pdb/} origin=`origin_from_pdb $iport` || continue @@ -1447,8 +1451,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then echo " ===>>> $pd/$origin does not exist for $pkg" continue fi - unique_name=`make -V UNIQUENAME` - unique_list="${unique_list}${unique_name}:" + unique_list="${unique_list}`make -V UNIQUENAME`:" done echo "===>>> Checking $port_dbdir" @@ -2975,7 +2978,13 @@ if [ -z "$REPLACE_ORIGIN" ]; then fi else portdir="${1#$pd/}" ; portdir="${portdir%/}" - if [ ! -d "$pd/$portdir" ]; then + if [ -z "$PM_INDEX_ONLY" ]; then + [ -d "$pd/$portdir" ] || missing=missing + else + parse_index $portdir name >/dev/null || missing=missing + fi + + if [ -n "$missing" ]; then echo '' echo "===>>> The first argument to -o must be a directory in $pd" echo '' ; no_valid_port From owner-svn-src-user@FreeBSD.ORG Mon Apr 11 01:19:03 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 2E8D61065675; Mon, 11 Apr 2011 01:19:03 +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 1E5958FC16; Mon, 11 Apr 2011 01:19:03 +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 p3B1J3Bq065654; Mon, 11 Apr 2011 01:19:03 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3B1J3Qk065652; Mon, 11 Apr 2011 01:19:03 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104110119.p3B1J3Qk065652@svn.freebsd.org> From: Doug Barton Date: Mon, 11 Apr 2011 01:19:02 +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: r220531 - 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: Mon, 11 Apr 2011 01:19:03 -0000 Author: dougb Date: Mon Apr 11 01:19:02 2011 New Revision: 220531 URL: http://svn.freebsd.org/changeset/base/220531 Log: Make the --index* options more friendly to being duplicated in the rc file and command line. Mixing different options will still trigger an error, however having the same option both places will not. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Apr 10 20:43:07 2011 (r220530) +++ user/dougb/portmaster/portmaster Mon Apr 11 01:19:02 2011 (r220531) @@ -557,10 +557,11 @@ cross_idx () { e1='The --index, --index-first, and --index-only options are mutually exclusive' - case "$1" in - index) [ -n "$PM_INDEX_FIRST" -o -n "$PM_INDEX_ONLY" ] && fail $e1 ;; - first) [ -n "$PM_INDEX" -o -n "$PM_INDEX_ONLY" ] && fail $e1 ;; - only) [ -n "$PM_INDEX" -o -n "$PM_INDEX_FIRST" ] && fail $e1 ;; + case "$*" in + *--index*--index*) fail $e1 ;; + index\ *) [ -n "$PM_INDEX_FIRST" -o -n "$PM_INDEX_ONLY" ] && fail $e1 ;; + first\ *) [ -n "$PM_INDEX_ONLY" ] && fail $e1 ;; + only\ *) [ -n "$PM_INDEX_FIRST" ] && fail $e1 ;; esac } @@ -597,11 +598,11 @@ for var in "$@" ; do --no-term-title) PM_NO_TERM_TITLE=pm_no_term_title export PM_NO_TERM_TITLE ;; --no-index-fetch) PM_NO_INDEX_FETCH=pm_no_index_fetch ;; - --index) cross_idx index ; PM_INDEX=pm_index ; export PM_INDEX ;; - --index-first) cross_idx first ; PM_INDEX=pm_index + --index) cross_idx "index $*" ; PM_INDEX=pm_index ; export PM_INDEX ;; + --index-first) cross_idx "first $*" ; PM_INDEX=pm_index PM_INDEX_FIRST=pm_index_first export PM_INDEX PM_INDEX_FIRST ;; - --index-only) cross_idx only ; PM_INDEX=pm_index + --index-only) cross_idx "only $*" ; PM_INDEX=pm_index PM_INDEX_ONLY=pm_index_only export PM_INDEX PM_INDEX_ONLY ;; --help) usage 0 ;; From owner-svn-src-user@FreeBSD.ORG Mon Apr 11 03:12:11 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 EABD0106566C; Mon, 11 Apr 2011 03:12:10 +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 D9E218FC20; Mon, 11 Apr 2011 03:12:10 +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 p3B3CA1p068231; Mon, 11 Apr 2011 03:12:10 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3B3CAHg068227; Mon, 11 Apr 2011 03:12:10 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104110312.p3B3CAHg068227@svn.freebsd.org> From: Doug Barton Date: Mon, 11 Apr 2011 03:12:10 +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: r220533 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Apr 2011 03:12:11 -0000 Author: dougb Date: Mon Apr 11 03:12:10 2011 New Revision: 220533 URL: http://svn.freebsd.org/changeset/base/220533 Log: Update supporting files for new features: * --update-if-newer * --check-depends can take --index|--index-only * portmaster.rc file located with the script Modified: user/dougb/portmaster/files/bash-completions user/dougb/portmaster/files/portmaster.8 user/dougb/portmaster/files/zsh-completions Modified: user/dougb/portmaster/files/bash-completions ============================================================================== --- user/dougb/portmaster/files/bash-completions Mon Apr 11 01:43:59 2011 (r220532) +++ user/dougb/portmaster/files/bash-completions Mon Apr 11 03:12:10 2011 (r220533) @@ -13,6 +13,7 @@ _portmaster () { --packages-build --packages-if-newer --delete-build-only \ --always-fetch --delete-packages \ --local-packagedir= --packages-local \ + --update-if-newer \ --no-confirm --no-term-title --no-index-fetch \ --index --index-first --index-only \ --clean-distfiles --clean-packages \ Modified: user/dougb/portmaster/files/portmaster.8 ============================================================================== --- user/dougb/portmaster/files/portmaster.8 Mon Apr 11 01:43:59 2011 (r220532) +++ user/dougb/portmaster/files/portmaster.8 Mon Apr 11 03:12:10 2011 (r220533) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 16, 2011 +.Dd April 10, 2011 .Dt PORTMASTER 8 .Os .Sh NAME @@ -61,6 +61,7 @@ This is a change from pre-version-2.3 be .Pp .Nm .Op Common Flags +.Op Fl -update-if-newer .Ar Multiple full names or paths from /usr/ports or /var/db/pkg, and/or multiple globs from /var/db/pkg .Nm @@ -109,6 +110,7 @@ and/or multiple globs from /var/db/pkg .Fl -clean-packages .Nm .Op Fl n|y +.Op Fl -index|-index-only .Op Fl v .Fl -check-depends .Nm @@ -391,6 +393,9 @@ requirements. .It Fl -delete-build-only delete ports that are build-only dependencies after a successful run, only if installed this run +.It Fl -update-if-newer +(only for multiple ports listed on the command line) +do not rebuild/reinstall if the installed version is up to date .It Fl P|--packages use packages, but build port if not available .It Fl PP|--packages-only @@ -656,6 +661,11 @@ These files will be read by the parent .Nm process, and all variables in them will be exported. +If a +.Pa portmaster.rc +file is placed in the same directory as the +.Nm +script itself, it will be read as described above. .Pp .It Pa /var/db/pkg/*/+IGNOREME If this file exists for a port that is already installed, Modified: user/dougb/portmaster/files/zsh-completions ============================================================================== --- user/dougb/portmaster/files/zsh-completions Mon Apr 11 01:43:59 2011 (r220532) +++ user/dougb/portmaster/files/zsh-completions Mon Apr 11 03:12:10 2011 (r220533) @@ -31,6 +31,7 @@ _arguments -A "-*" : \ "--index-first[use the INDEX for status, but double-check with the port]" \ "--index-only[do not try to use /usr/ports]" \ "--delete-build-only[delete ports that are build-only dependencies after a successful run]" \ + "--update-if-newer[(only for multiple ports) do not rebuild if installed version is up to date]" \ {-P,--packages}"[use packages, but build port if not available]" \ {-PP,--packages-only}"[fail if no package is available]" \ "--packages-build[use packages for all build dependencies]" \ From owner-svn-src-user@FreeBSD.ORG Mon Apr 11 17:39:07 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 8ED8D1065673; Mon, 11 Apr 2011 17:39:07 +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 7F67E8FC12; Mon, 11 Apr 2011 17:39:07 +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 p3BHd7q4095072; Mon, 11 Apr 2011 17:39:07 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3BHd7HN095070; Mon, 11 Apr 2011 17:39:07 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104111739.p3BHd7HN095070@svn.freebsd.org> From: Doug Barton Date: Mon, 11 Apr 2011 17:39:07 +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: r220543 - 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: Mon, 11 Apr 2011 17:39:07 -0000 Author: dougb Date: Mon Apr 11 17:39:07 2011 New Revision: 220543 URL: http://svn.freebsd.org/changeset/base/220543 Log: In multiport() with --update-if-newer, handle the case where all listed ports are already up to date. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Apr 11 15:03:01 2011 (r220542) +++ user/dougb/portmaster/portmaster Mon Apr 11 17:39:07 2011 (r220543) @@ -2666,6 +2666,10 @@ multiport () { done echo '' + if [ -z "$worklist" ]; then + echo "===>>> All listed ports are up to date, exiting" ; echo '' + safe_exit + fi echo "===>>> Working on multiple ports:" echo -e $portlist From owner-svn-src-user@FreeBSD.ORG Tue Apr 12 00:05:01 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 7713F106564A; Tue, 12 Apr 2011 00:05:01 +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 601438FC0C; Tue, 12 Apr 2011 00:05:01 +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 p3C051mb003750; Tue, 12 Apr 2011 00:05:01 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3C051D9003748; Tue, 12 Apr 2011 00:05:01 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104120005.p3C051D9003748@svn.freebsd.org> From: Doug Barton Date: Tue, 12 Apr 2011 00:05:01 +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: r220553 - 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: Tue, 12 Apr 2011 00:05:01 -0000 Author: dougb Date: Tue Apr 12 00:05:01 2011 New Revision: 220553 URL: http://svn.freebsd.org/changeset/base/220553 Log: Fix the problem created by jumbo numeric uids, and simplify the code in the process. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Mon Apr 11 22:01:06 2011 (r220552) +++ user/dougb/portmaster/portmaster Tue Apr 12 00:05:01 2011 (r220553) @@ -39,8 +39,8 @@ if [ -z "$PM_PARENT_PID" ]; then my_environment=`set` # If we are already root, unset this to avoid potential conflict - euid=`ps -o uid $$` ; euid=${euid##* } - [ "$euid" -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE + euid=`ps -o uid= $$` + [ $euid -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE unset euid fi From owner-svn-src-user@FreeBSD.ORG Tue Apr 12 00:38:23 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 5003E106564A; Tue, 12 Apr 2011 00:38:23 +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 3DAB08FC0A; Tue, 12 Apr 2011 00:38:23 +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 p3C0cN50004439; Tue, 12 Apr 2011 00:38:23 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3C0cNdG004437; Tue, 12 Apr 2011 00:38:23 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201104120038.p3C0cNdG004437@svn.freebsd.org> From: Doug Barton Date: Tue, 12 Apr 2011 00:38:23 +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: r220554 - 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: Tue, 12 Apr 2011 00:38:23 -0000 Author: dougb Date: Tue Apr 12 00:38:22 2011 New Revision: 220554 URL: http://svn.freebsd.org/changeset/base/220554 Log: Apply the same header-stripping ps trick to finding the pgid Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Tue Apr 12 00:05:01 2011 (r220553) +++ user/dougb/portmaster/portmaster Tue Apr 12 00:38:22 2011 (r220554) @@ -101,7 +101,7 @@ trap_exit () { kill_bad_children () { local mypgid pid ppid pgid command ; IFS=' ' - mypgid=`ps -o pgid -p $PM_PARENT_PID` ; mypgid=${mypgid##*PGID[^0-9]} + mypgid=`ps -o pgid= -p $PM_PARENT_PID` ps -axo pid,ppid,pgid,command | sed '1d' | while read pid ppid pgid command; do [ "$pid" -gt 25 ] || continue