From owner-svn-src-user@FreeBSD.ORG  Mon Feb  8 05:13:09 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 10A30106566C;
	Mon,  8 Feb 2010 05:13:09 +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 EF27D8FC19;
	Mon,  8 Feb 2010 05:13:08 +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 o185D80Y042150;
	Mon, 8 Feb 2010 05:13:08 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o185D84K042148;
	Mon, 8 Feb 2010 05:13:08 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201002080513.o185D84K042148@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Mon, 8 Feb 2010 05:13:08 +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: r203651 - 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: Mon, 08 Feb 2010 05:13:09 -0000

Author: dougb
Date: Mon Feb  8 05:13:08 2010
New Revision: 203651
URL: http://svn.freebsd.org/changeset/base/203651

Log:
  1. Fix 2 places where sudo privileges might be needed but the non-sudo
  version of the command was called. [1]
  
  2. Condense the "don't do term_printf() if we're on cons25" test
  into a simpler version.
  
  Submitted by:	N.J. Mann <njm@njm.me.uk> [1] (for pkg_delete)

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon Feb  8 05:08:42 2010	(r203650)
+++ user/dougb/portmaster/portmaster	Mon Feb  8 05:13:08 2010	(r203651)
@@ -199,7 +199,7 @@ safe_exit () {
 			cd
 			for f in $build_deps_il; do
 				[ -n "$PM_VERBOSE" ] && echo "       $f"
-				pkg_delete -f $f
+				pm_pkg_delete_s -f $f
 			done
 			echo ''
 		fi
@@ -1666,10 +1666,7 @@ check_fetch_only () {
 
 term_printf () {
 	[ -n "$PM_NO_TERM_TITLE" ] && return
-
-	case "$TERM" in
-	cons25)	return ;;
-	esac
+	[ "$TERM" = cons25 ] && return
 
 	printf "\033]0;${0##*/}: ${PM_PARENT_PORT}${1}\007"
 }
@@ -2702,7 +2699,7 @@ fetch_package () {
 		fi
 
 		fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null || {
-			pm_unlink ${ppd}/${1}.tbz;
+			pm_unlink_s ${ppd}/${1}.tbz;
 			fetch $fetch_args -o $ppd ${sitepath}${1}.tbz 2>/dev/null; }
 	fi
 }