From owner-svn-src-user@FreeBSD.ORG  Fri Aug 26 22:33:41 2011
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 B96BF1065678;
	Fri, 26 Aug 2011 22:33:41 +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 AA3468FC1F;
	Fri, 26 Aug 2011 22:33:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7QMXfdV073597;
	Fri, 26 Aug 2011 22:33:41 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7QMXfi4073595;
	Fri, 26 Aug 2011 22:33:41 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201108262233.p7QMXfi4073595@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 26 Aug 2011 22:33:41 +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: r225204 - 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, 26 Aug 2011 22:33:41 -0000

Author: dougb
Date: Fri Aug 26 22:33:41 2011
New Revision: 225204
URL: http://svn.freebsd.org/changeset/base/225204

Log:
  For --clean-packages if a package is up to date but not installed
  it should still be deleted if -y is in use.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Aug 26 21:46:36 2011	(r225203)
+++ user/dougb/portmaster/portmaster	Fri Aug 26 22:33:41 2011	(r225204)
@@ -1332,16 +1332,14 @@ if [ -n "$CLEAN_PACKAGES" ]; then
 		if [ -n "$port_ver" ]; then
 			if [ "${port_ver}.tbz" = "${package##*/}" ]; then
 				echo "===>>> ${package##*/} is up to date"
-				if [ -z "$PM_YES" ]; then
-					if [ ! -d "${pdb}/${pkg_dir}" ]; then
-						echo "	===>>> $pkg_dir is not installed"
-						echo "	===>>> Path: ${package}"
-						get_answer_yn y "	===>>> Delete stale package: ${package##*/}"
-						case "$?" in
-						0)	echo "	===>>> Deleting $package"
-							pm_unlink_s $package ;;
-						esac
-					fi
+				if [ ! -d "${pdb}/${pkg_dir}" ]; then
+					echo "	===>>> $pkg_dir is not installed"
+					echo "	===>>> Path: ${package}"
+					get_answer_yn y "	===>>> Delete stale package: ${package##*/}"
+					case "$?" in
+					0)	echo "	===>>> Deleting $package"
+						pm_unlink_s $package ;;
+					esac
 				fi
 				unset port_ver
 				continue