bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Dan McGee 2008-04-10 20:54:34 -05:00
commit 4bd0a85095
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/libalpm/add.c
View file

@ -431,7 +431,7 @@ static int extract_single_file(struct archive *archive,
} }
if(needbackup) { if(needbackup) {
char *tempfile = NULL; char *tempfile;
char *hash_local = NULL, *hash_pkg = NULL; char *hash_local = NULL, *hash_pkg = NULL;
int fd; int fd;
@ -439,9 +439,8 @@ static int extract_single_file(struct archive *archive,
tempfile = strdup("/tmp/alpm_XXXXXX"); tempfile = strdup("/tmp/alpm_XXXXXX");
fd = mkstemp(tempfile); fd = mkstemp(tempfile);
archive_entry_set_pathname(entry, tempfile); int ret = archive_read_data_into_fd(archive, fd);
close(fd);
int ret = archive_read_extract(archive, entry, archive_flags);
if(ret == ARCHIVE_WARN) { if(ret == ARCHIVE_WARN) {
/* operation succeeded but a non-critical error was encountered */ /* operation succeeded but a non-critical error was encountered */
_alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n", _alpm_log(PM_LOG_DEBUG, "warning extracting %s (%s)\n",
@ -452,8 +451,8 @@ static int extract_single_file(struct archive *archive,
alpm_logaction("error: could not extract %s (%s)\n", alpm_logaction("error: could not extract %s (%s)\n",
entryname, archive_error_string(archive)); entryname, archive_error_string(archive));
unlink(tempfile); unlink(tempfile);
FREE(tempfile);
FREE(hash_orig); FREE(hash_orig);
close(fd);
return(1); return(1);
} }
@ -563,7 +562,6 @@ static int extract_single_file(struct archive *archive,
FREE(hash_orig); FREE(hash_orig);
unlink(tempfile); unlink(tempfile);
FREE(tempfile); FREE(tempfile);
close(fd);
} else { } else {
/* we didn't need a backup */ /* we didn't need a backup */
if(notouch) { if(notouch) {