From owner-svn-src-user@FreeBSD.ORG Fri Dec 24 04:52:54 2010 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 21151106566B; Fri, 24 Dec 2010 04:52:54 +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 114418FC08; Fri, 24 Dec 2010 04:52:54 +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 oBO4qrCg079000; Fri, 24 Dec 2010 04:52:53 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBO4qrhh078998; Fri, 24 Dec 2010 04:52:53 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012240452.oBO4qrhh078998@svn.freebsd.org> From: Doug Barton Date: Fri, 24 Dec 2010 04:52:53 +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: r216684 - 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: Fri, 24 Dec 2010 04:52:54 -0000 Author: dougb Date: Fri Dec 24 04:52:53 2010 New Revision: 216684 URL: http://svn.freebsd.org/changeset/base/216684 Log: Clean up empty directories WRKDIRPREFIX when the parent exits This is not only tidier, but it also helps the situation when portmaster is occasionally run as root even though most usage is with the built-in sudo support. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 24 01:37:13 2010 (r216683) +++ user/dougb/portmaster/portmaster Fri Dec 24 04:52:53 2010 (r216684) @@ -146,6 +146,9 @@ parent_exit () { for f in ${TMPDIR}/f-${PM_PARENT_PID}-*; do pm_unlink $f ; done + [ -n "$PM_WRKDIRPREFIX" ] && + find -d $PM_WRKDIRPREFIX -mindepth 1 -type d -empty -delete 2>/dev/null + case "$DISPLAY_LIST" in *' '*) if [ -n "$1" ]; then echo "===>>> There are messages from installed ports to display," @@ -3042,7 +3045,11 @@ fi # Do these things first time through if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then # Do not start this in the background until we are sure we are going to build - [ "$$" -eq "$PM_PARENT_PID" -a -n "$DI_FILES" ] && (read_distinfos)& + if [ "$$" -eq "$PM_PARENT_PID" ]; then + [ -n "$DI_FILES" ] && (read_distinfos)& + + PM_WRKDIRPREFIX=`pm_make_b -V WRKDIRPREFIX` + fi # Handle the problem of manual fetching [ -z "$PM_PACKAGES" ] && master_sites=`pm_make -V MASTER_SITES` From owner-svn-src-user@FreeBSD.ORG Fri Dec 24 06:41:30 2010 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 3C3FD106566C; Fri, 24 Dec 2010 06:41:30 +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 2C6058FC08; Fri, 24 Dec 2010 06:41:30 +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 oBO6fUTb081215; Fri, 24 Dec 2010 06:41:30 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBO6fUV0081213; Fri, 24 Dec 2010 06:41:30 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201012240641.oBO6fUV0081213@svn.freebsd.org> From: Doug Barton Date: Fri, 24 Dec 2010 06:41:30 +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: r216686 - 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: Fri, 24 Dec 2010 06:41:30 -0000 Author: dougb Date: Fri Dec 24 06:41:29 2010 New Revision: 216686 URL: http://svn.freebsd.org/changeset/base/216686 Log: Error handling for INDEX fetch Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 24 04:55:56 2010 (r216685) +++ user/dougb/portmaster/portmaster Fri Dec 24 06:41:29 2010 (r216686) @@ -755,8 +755,10 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then [ -n "$index_time" ] && { $index_fetch 2>/dev/null && do_index_fetch=no_index_fetch; } - [ "$do_index_fetch" = yes_index_fetch ] && { - pm_sv 'Fetching new INDEX file'; $PM_SU_CMD $index_fetch; } + if [ "$do_index_fetch" = yes_index_fetch ]; then + pm_sv 'Fetching new INDEX file' + $PM_SU_CMD $index_fetch || fail Could not perform $index_fetch + fi if [ ${index_time:-0} -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then temp_index=`pm_mktemp index`