PERFORCE change 181526 for review
Julien Laffaye
jlaffaye at FreeBSD.org
Wed Jul 28 17:25:20 UTC 2010
http://p4web.freebsd.org/@@181526?ac=10
Change 181526 by jlaffaye at 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);
}
More information about the p4-projects
mailing list