svn commit: r225204 - user/dougb/portmaster

[Doug Barton]

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