svn commit: r203651 - user/dougb/portmaster

[Doug Barton]

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 at 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
 }