From owner-svn-src-user@FreeBSD.ORG  Fri Jul 23 05:42:51 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 3E4E31065672;
	Fri, 23 Jul 2010 05:42:51 +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 E195F8FC0A;
	Fri, 23 Jul 2010 05:42:49 +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 o6N5gnV8092467;
	Fri, 23 Jul 2010 05:42:49 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N5gnlq092466;
	Fri, 23 Jul 2010 05:42:49 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201007230542.o6N5gnlq092466@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 23 Jul 2010 05:42:49 +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: r210399 - 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 &quot; user&quot;
	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: Fri, 23 Jul 2010 05:42:51 -0000

Author: dougb
Date: Fri Jul 23 05:42:49 2010
New Revision: 210399
URL: http://svn.freebsd.org/changeset/base/210399

Log:
  Add an option to log actions after the run is complete. To enable it
  define PM_LOG in your rc file as the path of the file you want to log
  to. If using PM_SU_CMD make sure that the directory or file is writable
  by the unprivileged user.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Jul 22 23:30:24 2010	(r210398)
+++ user/dougb/portmaster/portmaster	Fri Jul 23 05:42:49 2010	(r210399)
@@ -180,16 +180,31 @@ parent_exit () {
 	if [ -n "$INSTALLED_LIST" ]; then
 		if [ -n "$UPDATE_ALL" -o -n "$PM_MULTI_PORTS" ]; then
 			show_list=all
-		else
+		elif [ -z "$show_list" ]; then
 			case "$INSTALLED_LIST" in
 			*\\n\\t*)	show_list=all ;;
 			*\\n)		show_list=one ;;
 			esac
 		fi
+		if [ -n "$PM_LOG" ]; then
+			if [ -f "$PM_LOG" ]; then
+				echo '' >> $PM_LOG
+			elif [ -e "$PM_LOG" -o -L "$PM_LOG" ]; then
+				echo "===>>> Warning: $PM_LOG exists, but is not a regular file"
+			else
+				local new_pm_log
+
+				new_pm_log=`pm_mktemp pm_log` &&
+					mv $new_pm_log $PM_LOG
+			fi
+			date >> $PM_LOG
+		fi
 		case "$show_list" in
 		all)	echo "===>>> The following actions were performed:"
-			echo -e $INSTALLED_LIST ;;
-		one)	echo "===>>> $ilist complete" ; echo '' ;;
+			echo -e $INSTALLED_LIST
+			[ -n "$PM_LOG" ] && echo -e $INSTALLED_LIST >> $PM_LOG ;;
+		one)	echo "===>>> $ilist complete" ; echo ''
+			[ -n "$PM_LOG" ] && echo "	$ilist" >> $PM_LOG ;;
 		esac
 	fi