PERFORCE change 178189 for review

[Garrett Cooper]

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

Change 178189 by gcooper at 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) {