From owner-svn-src-user@FreeBSD.ORG  Sun Apr  4 23:45:13 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 5C53D1065672;
	Sun,  4 Apr 2010 23:45:13 +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 4C3228FC15;
	Sun,  4 Apr 2010 23:45:13 +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 o34NjDfY058969;
	Sun, 4 Apr 2010 23:45:13 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o34NjD1k058967;
	Sun, 4 Apr 2010 23:45:13 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201004042345.o34NjD1k058967@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 4 Apr 2010 23:45:13 +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: r206172 - 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: Sun, 04 Apr 2010 23:45:13 -0000

Author: dougb
Date: Sun Apr  4 23:45:13 2010
New Revision: 206172
URL: http://svn.freebsd.org/changeset/base/206172

Log:
  If we're already root, in addition to unsetting PM_SU_CMD
  we also need to unset PM_SU_VERBOSE to avoid spamming for
  no reason.
  
  While I'm here, unset euid when we're done with it.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Apr  4 23:33:44 2010	(r206171)
+++ user/dougb/portmaster/portmaster	Sun Apr  4 23:45:13 2010	(r206172)
@@ -38,7 +38,8 @@ if [ -z "$PM_PARENT_PID" ]; then
 
 	# If we are already root, unset this to avoid potential conflict
 	euid=`ps -o uid $$` ; euid=${euid##* }
-	[ "$euid" -eq 0 ] && unset PM_SU_CMD
+	[ "$euid" -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE
+	unset euid
 fi
 
 umask 022