moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Implement disk space checking

Browse Source 
Pull together the work of the previous commits to implement a check
for enough free space before performing an install transaction. Abort
if there is not enough free space with an appropriate pm_errno..

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2010-11-16 16:43:45 +10:00 committed by Dan McGee
parent e527699ddd
commit 3f0d98c124
3 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/alpm.h
View File

@ -479,6 +479,7 @@ enum _pmerrno_t {
PM_ERR_NOT_A_FILE, PM_ERR_NOT_A_FILE,
PM_ERR_NOT_A_DIR, PM_ERR_NOT_A_DIR,
PM_ERR_WRONG_ARGS, PM_ERR_WRONG_ARGS,
PM_ERR_DISK_SPACE,
/* Interface */ /* Interface */
PM_ERR_HANDLE_NULL, PM_ERR_HANDLE_NULL,
PM_ERR_HANDLE_NOT_NULL, PM_ERR_HANDLE_NOT_NULL,

43
lib/libalpm/diskspace.c
View File

@ -254,7 +254,10 @@ cleanup:
int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db) int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db)
{ {
alpm_list_t *mount_points; alpm_list_t *mount_points, *i;
int replaces = 0, abort = 0;
alpm_list_t *targ;
pmpkg_t *pkg;
mount_points = mount_point_list(); mount_points = mount_point_list();
if(mount_points == NULL) { if(mount_points == NULL) {
@ -262,6 +265,40 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db)
return -1; return -1;
} }
replaces = alpm_list_count(trans->remove);
if(replaces) {
for(targ = trans->remove; targ; targ = targ->next) {
pkg = (pmpkg_t*)targ->data;
calculate_removed_size(pkg, mount_points);
}
}
for(targ = trans->add; targ; targ = targ->next) {
pkg = (pmpkg_t*)targ->data;
if(_alpm_db_get_pkgfromcache(db, pkg->name)) {
calculate_removed_size(pkg, mount_points);
}
calculate_installed_size(pkg, mount_points);
for(i = mount_points; i; i = alpm_list_next(i)) {
alpm_mountpoint_t *data = i->data;
if(data->blocks_needed > data->max_blocks_needed) {
data->max_blocks_needed = data->blocks_needed;
}
}
}
for(i = mount_points; i; i = alpm_list_next(i)) {
alpm_mountpoint_t *data = i->data;
if(data->used == 1) {
_alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, free %ld\n",
data->mount_dir, data->max_blocks_needed, (long int)(data->fsp->f_bfree));
if(data->max_blocks_needed > data->fsp->f_bfree) {
abort = 1;
}
}
}
for(i = mount_points; i; i = alpm_list_next(i)) { for(i = mount_points; i; i = alpm_list_next(i)) {
alpm_mountpoint_t *data = i->data; alpm_mountpoint_t *data = i->data;
FREE(data->mount_dir); FREE(data->mount_dir);
@ -269,6 +306,10 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db)
} }
FREELIST(mount_points); FREELIST(mount_points);
if(abort) {
RET_ERR(PM_ERR_DISK_SPACE, -1);
}
return 0; return 0;
} }

2
lib/libalpm/error.c
View File

@ -60,6 +60,8 @@ const char SYMEXPORT *alpm_strerror(int err)
return _("could not find or read directory"); return _("could not find or read directory");
case PM_ERR_WRONG_ARGS: case PM_ERR_WRONG_ARGS:
return _("wrong or NULL argument passed"); return _("wrong or NULL argument passed");
case PM_ERR_DISK_SPACE:
return _("not enough disk space");
/* Interface */ /* Interface */
case PM_ERR_HANDLE_NULL: case PM_ERR_HANDLE_NULL:
return _("library not initialized"); return _("library not initialized");