From owner-svn-src-user@FreeBSD.ORG  Fri Jul 23 08:23:31 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 14719106566C;
	Fri, 23 Jul 2010 08:23:31 +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 02D2D8FC19;
	Fri, 23 Jul 2010 08:23:31 +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 o6N8NUnf032052;
	Fri, 23 Jul 2010 08:23:30 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6N8NUZ0032051;
	Fri, 23 Jul 2010 08:23:30 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201007230823.o6N8NUZ0032051@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 23 Jul 2010 08:23:30 +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: r210405 - 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, 23 Jul 2010 08:23:31 -0000

Author: dougb
Date: Fri Jul 23 08:23:30 2010
New Revision: 210405
URL: http://svn.freebsd.org/changeset/base/210405

Log:
  In --clean-packages if a package after the first has a missing ORIGIN
  port_ver will still contain the value from the previous port, so fix this.
  Reported by:	Alexey Markov <a.markov@complitex.ru>
  
  Further improve the messages to the user for this feature.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri Jul 23 08:20:14 2010	(r210404)
+++ user/dougb/portmaster/portmaster	Fri Jul 23 08:23:30 2010	(r210405)
@@ -1046,9 +1046,13 @@ if [ -n "$CLEAN_PACKAGES" ]; then
 				[ -n "$port_ver" ] || fail "Is $pd/$origin/Makefile missing?"
 			else
 				echo "===>>> The origin for ${package##*/} ($origin) is missing"
+				unset port_ver
 			fi
 		else
-			port_ver=`parse_index $origin name`
+			if ! port_ver=`parse_index $origin name`; then
+				echo "===>>> Cannot determine latest version of ${package##*/} from INDEX"
+				unset port_ver
+			fi
 		fi
 
 		if [ -n "$port_ver" ]; then
@@ -1064,10 +1068,10 @@ if [ -n "$CLEAN_PACKAGES" ]; then
 			else
 				echo "	===>>> ${package##*/} is out of date"
 			fi
-		else
-			echo "===>>> ${package#$PACKAGES/}"
 		fi
 
+		echo "	===>>> Path: ${package}"
+
 		if [ -z "$ALL" ]; then
 			echo -n "	===>>> Delete stale package: ${package##*/}? y/n [y] "
 			read answer
@@ -1080,7 +1084,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
 		pm_unlink_s $package
 	done
 
-	echo "===>>> Deleting stale symlinks"
+	echo '' ; echo "===>>> Deleting stale symlinks"
 	pm_cd $PACKAGES || fail "Cannot cd to $PACKAGES"
 	for link in `find . -type l` ; do
 		if [ ! -e "$link" ]; then
@@ -1089,7 +1093,7 @@ if [ -n "$CLEAN_PACKAGES" ]; then
 		fi
 	done
 
-	echo "===>>> Deleting empty directories (if any)"
+	echo '' ; echo "===>>> Deleting empty directories (if any)"
 	pm_find_s . -type d -empty -delete
 
 	safe_exit