From owner-p4-projects@FreeBSD.ORG  Thu May 13 03:40:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F3B61065675; Thu, 13 May 2010 03:40:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D7F68106566B
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 03:40:24 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C51488FC13
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 03:40:24 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o4D3eO1Z027037
	for <perforce@FreeBSD.org>; Thu, 13 May 2010 03:40:24 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o4D3eOuv027035
	for perforce@freebsd.org; Thu, 13 May 2010 03:40:24 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 13 May 2010 03:40:24 GMT
Message-Id: <201005130340.o4D3eOuv027035@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 178189 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 May 2010 03:40:25 -0000

http://p4web.freebsd.org/@@178189?ac=10

Change 178189 by gcooper@starr-bastion on 2010/05/13 03:40:24

	Nuke all of the ad hoc duplicated metadata add code that was in make_dist.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#21 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/usr.sbin/pkg_install/create/perform.c#21 (text+ko) ====

@@ -541,42 +541,6 @@
 	if (error == NULL &&
 	    archive_write_open_fd(archive, archive_fd) != ARCHIVE_OK)
 		error = archive_error_string(archive);
-	if (error == NULL) {
-
-		if (Verbose)
-			printf("Creating %sed tar ball in '%s'\n",
-			    cname, tball);
-
-		ADD_FILE(CONTENTS_FNAME, CONTENTS_FNAME,
-		    archive_metadata_open_flags);
-		ADD_FILE(COMMENT_FNAME, COMMENT_FNAME,
-		    archive_metadata_open_flags);
-		ADD_FILE(DESC_FNAME, DESC_FNAME,
-		    archive_metadata_open_flags);
-
-		if (Install)
-			ADD_FILE(Install, INSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (PostInstall)
-			ADD_FILE(PostInstall, POST_INSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (DeInstall)
-			ADD_FILE(DeInstall, DEINSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (PostDeInstall)
-			ADD_FILE(PostDeInstall, POST_DEINSTALL_FNAME,
-			    archive_metadata_open_flags);
-		if (Require)
-			ADD_FILE(Require, REQUIRE_FNAME,
-			    archive_metadata_open_flags);
-		if (Display)
-			ADD_FILE(Display, DISPLAY_FNAME,
-			    archive_metadata_open_flags);
-		if (Mtree)
-			ADD_FILE(Mtree, MTREE_FNAME,
-			    archive_metadata_open_flags);
-
-	}
 
 	for (p = plist->head; error == NULL && p != NULL; p = p->next)
 		switch(p->type) {