[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c)
Date: Friday, August 17, 2007 @ 16:07:05 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.133 -> 1.134) Fix symlink overwrite issue in CVS -------+ add.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.133 pacman-lib/lib/libalpm/add.c:1.134 --- pacman-lib/lib/libalpm/add.c:1.133 Wed Jun 20 17:52:24 2007 +++ pacman-lib/lib/libalpm/add.c Fri Aug 17 16:07:05 2007 @@ -700,7 +700,9 @@ archive_entry_set_pathname(entry, filename); - if(archive_read_extract(archive, entry, ARCHIVE_EXTRACT_FLAGS) != ARCHIVE_OK) { + int ret = archive_read_extract(archive, entry, + ARCHIVE_EXTRACT_FLAGS | ARCHIVE_EXTRACT_NO_OVERWRITE); + if(ret != ARCHIVE_OK && ret != ARCHIVE_WARN) { _alpm_log(PM_LOG_ERROR, _("could not extract %s (%s)"), filename, strerror(errno)); alpm_logaction(_("error: could not extract %s (%s)"), filename, strerror(errno)); errors++;
participants (1)
-
Dan McGee