From 25fab402c79aeaa5b72959c7bfd2e541a1b34045 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 11 Jan 2011 21:13:04 -0600 Subject: Call archive_read_data_skip() while checking diskspace libarchive eventually calls it anyway, but backtraces make a lot more sense if we call it, as well as matching our precedent from alpm_pkg_load(). Signed-off-by: Dan McGee --- lib/libalpm/diskspace.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/libalpm/diskspace.c') diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index b3c340af..dfafdac0 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -232,6 +232,13 @@ static int calculate_installed_size(const alpm_list_t *mount_points, data->blocks_needed += (archive_entry_size(entry) + data->fsp.f_bsize - 1l) / data->fsp.f_bsize; data->used = 1; + + if(archive_read_data_skip(archive)) { + _alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"), + pkg->name, archive_error_string(archive)); + pm_errno = PM_ERR_LIBARCHIVE; + break; + } } archive_read_finish(archive); -- cgit v1.2.3-24-g4f1b