From owner-svn-src-user@FreeBSD.ORG  Sun Aug  1 06:36:41 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 9FE981065678;
	Sun,  1 Aug 2010 06:36: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 5A4028FC13;
	Sun,  1 Aug 2010 06:36:41 +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 o716afxl020539;
	Sun, 1 Aug 2010 06:36:41 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o716af00020537;
	Sun, 1 Aug 2010 06:36:41 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201008010636.o716af00020537@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 1 Aug 2010 06:36: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: r210713 - 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: Sun, 01 Aug 2010 06:36:41 -0000

Author: dougb
Date: Sun Aug  1 06:36:41 2010
New Revision: 210713
URL: http://svn.freebsd.org/changeset/base/210713

Log:
  Add $pd to $origin in clean_distinfos(). We're duplicating the same new
  code that I added to clean_distinfos_all() to optimize finding the
  distinfo file, but in the former ORIGIN comes from $pkg/+CONTENTS, which
  does not include $pd. This meant that --clean-distfiles[-all] was deleting
  every file. (Oops)

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sun Aug  1 02:27:16 2010	(r210712)
+++ user/dougb/portmaster/portmaster	Sun Aug  1 06:36:41 2010	(r210713)
@@ -881,6 +881,8 @@ read_distinfos () {
 			origin=$moved_npd
 		fi
 
+		origin="${pd}/${origin}"
+
 		if [ -s "${origin}/distinfo" ]; then
 			distinfo="${origin}/distinfo"
 		else