summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-11 21:20:12 -0600
committerDan McGee <dan@archlinux.org>2011-01-11 21:20:12 -0600
commitdd265921559b187cba59e83bfdbfda11bcec2f1e (patch)
tree7291c5788cb2f93916009d65bb48a5ec7d9f2d7c
parent57c5afd69c4c70ad85676bab32150d6182a3def9 (diff)
parent25fab402c79aeaa5b72959c7bfd2e541a1b34045 (diff)
downloadpacman-dd265921559b187cba59e83bfdbfda11bcec2f1e.tar.xz
Merge branch 'diskspace-fixes'
-rw-r--r--lib/libalpm/diskspace.c24
-rw-r--r--lib/libalpm/error.c2
2 files changed, 18 insertions, 8 deletions
diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index bc5f5127..dfafdac0 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -84,8 +84,8 @@ static alpm_list_t *mount_point_list(void)
mp->mount_dir = strdup(mnt->mnt_dir);
memcpy(&(mp->fsp), &fsp, sizeof(FSSTATSTYPE));
- mp->blocks_needed = 0;
- mp->max_blocks_needed = 0;
+ mp->blocks_needed = 0l;
+ mp->max_blocks_needed = 0l;
mp->used = 0;
mount_points = alpm_list_add(mount_points, mp);
@@ -107,8 +107,9 @@ static alpm_list_t *mount_point_list(void)
mp->mount_dir = strdup(fsp->f_mntonname);
memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE));
- mp->blocks_needed = 0;
- mp->max_blocks_needed = 0;
+ mp->blocks_needed = 0l;
+ mp->max_blocks_needed = 0l;
+ mp->used = 0;
mount_points = alpm_list_add(mount_points, mp);
}
@@ -178,8 +179,7 @@ static int calculate_removed_size(const alpm_list_t *mount_points,
data = mp->data;
/* the addition of (divisor - 1) performs ceil() with integer division */
data->blocks_needed -=
- (st.st_size + data->fsp.f_bsize - 1) / data->fsp.f_bsize;
- data->used = 1;
+ (st.st_size + data->fsp.f_bsize - 1l) / data->fsp.f_bsize;
}
return(0);
@@ -230,8 +230,15 @@ static int calculate_installed_size(const alpm_list_t *mount_points,
data = mp->data;
/* the addition of (divisor - 1) performs ceil() with integer division */
data->blocks_needed +=
- (archive_entry_size(entry) + data->fsp.f_bsize - 1) / data->fsp.f_bsize;
+ (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);
@@ -306,6 +313,9 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
(unsigned long)data->fsp.f_bfree);
if(data->max_blocks_needed + cushion >= 0 &&
(unsigned long)(data->max_blocks_needed + cushion) > data->fsp.f_bfree) {
+ _alpm_log(PM_LOG_ERROR, _("Partition %s too full: %ld blocks needed, %ld blocks free)\n"),
+ data->mount_dir, data->max_blocks_needed + cushion,
+ (unsigned long)data->fsp.f_bfree);
abort = 1;
}
}
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index 4dab9fa5..1b144a5a 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -58,7 +58,7 @@ const char SYMEXPORT *alpm_strerror(int err)
case PM_ERR_WRONG_ARGS:
return _("wrong or NULL argument passed");
case PM_ERR_DISK_SPACE:
- return _("not enough disk space");
+ return _("not enough free disk space");
/* Interface */
case PM_ERR_HANDLE_NULL:
return _("library not initialized");