From owner-p4-projects@FreeBSD.ORG  Wed Jul 28 17:25:20 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E2F171065674; Wed, 28 Jul 2010 17:25:19 +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 A77DD106566C
	for <perforce@FreeBSD.org>; Wed, 28 Jul 2010 17:25:19 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 95A008FC1F
	for <perforce@FreeBSD.org>; Wed, 28 Jul 2010 17:25:19 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6SHPJdK005219
	for <perforce@FreeBSD.org>; Wed, 28 Jul 2010 17:25:19 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6SHPJA1005217
	for perforce@freebsd.org; Wed, 28 Jul 2010 17:25:19 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Wed, 28 Jul 2010 17:25:19 GMT
Message-Id: <201007281725.o6SHPJA1005217@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye <jlaffaye@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181526 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: Wed, 28 Jul 2010 17:25:20 -0000

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

Change 181526 by jlaffaye@jlaffaye-chulak on 2010/07/28 17:24:40

	Let libarchive restore more infos about the extracted files.
	Remove some dead code.

Affected files ...

.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#10 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#10 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#10 (text+ko) ====

@@ -387,7 +387,12 @@
 		if (archive_read_next_header(a, &entry) == ARCHIVE_OK) {
 		    assert(strcmp(p->name, archive_entry_pathname(entry)) == 0);
 		    if (!Fake &&
-			archive_read_extract(a, entry, ARCHIVE_EXTRACT_PERM) !=
+			archive_read_extract(a, entry, ARCHIVE_EXTRACT_OWNER |
+					     ARCHIVE_EXTRACT_PERM |
+					     ARCHIVE_EXTRACT_TIME |
+					     ARCHIVE_EXTRACT_ACL |
+					     ARCHIVE_EXTRACT_FFLAGS |
+					     ARCHIVE_EXTRACT_XATTR) !=
 			ARCHIVE_OK) {
 			warnx("Can not extract '%s': %s",
 			      archive_entry_pathname(entry),

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#10 (text+ko) ====

@@ -221,6 +221,4 @@
 {
     if (extract_state == 1)
 	vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp);
-    else if (extract_state == 2)
-	vsystem("%s -rf %s", REMOVE_CMD, db_dir);
 }