moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove some more diskspace checking holdover stuff 

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-06-13 00:31:01 -04:00
parent caf6c326ec
commit 5e774d72b0
4 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/alpm.h
View File

@ -443,7 +443,6 @@ enum _pmerrno_t {
PM_ERR_USER_ABORT, PM_ERR_USER_ABORT,
PM_ERR_INTERNAL_ERROR, PM_ERR_INTERNAL_ERROR,
PM_ERR_LIBARCHIVE_ERROR, PM_ERR_LIBARCHIVE_ERROR,
PM_ERR_DISK_FULL,
PM_ERR_DB_SYNC, PM_ERR_DB_SYNC,
PM_ERR_RETRIEVE, PM_ERR_RETRIEVE,
PM_ERR_PKG_HOLD, PM_ERR_PKG_HOLD,

2
lib/libalpm/error.c
View File

@ -133,8 +133,6 @@ const char SYMEXPORT *alpm_strerror(int err)
return _("internal error"); return _("internal error");
case PM_ERR_LIBARCHIVE_ERROR: case PM_ERR_LIBARCHIVE_ERROR:
return _("libarchive error"); return _("libarchive error");
case PM_ERR_DISK_FULL:
return _("not enough space on disk");
case PM_ERR_PKG_HOLD: case PM_ERR_PKG_HOLD:
/* TODO wow this is not descriptive at all... what does this mean? */ /* TODO wow this is not descriptive at all... what does this mean? */
return _("not confirmed"); return _("not confirmed");

14
src/pacman/add.c
View File

@ -117,8 +117,6 @@ int pacman_add(alpm_list_t *targets)
/* Step 2: "compute" the transaction based on targets and flags */ /* Step 2: "compute" the transaction based on targets and flags */
/* TODO: No, compute nothing. This is stupid. */ /* TODO: No, compute nothing. This is stupid. */
if(alpm_trans_prepare(&data) == -1) { if(alpm_trans_prepare(&data) == -1) {
long long *pkgsize, *freespace;
fprintf(stderr, _("error: failed to prepare transaction (%s)\n"), fprintf(stderr, _("error: failed to prepare transaction (%s)\n"),
alpm_strerror(pm_errno)); alpm_strerror(pm_errno));
switch(pm_errno) { switch(pm_errno) {
@ -173,18 +171,6 @@ int pacman_add(alpm_list_t *targets)
} }
printf(_("\nerrors occurred, no packages were upgraded.\n")); printf(_("\nerrors occurred, no packages were upgraded.\n"));
break; break;
/* TODO This is gross... we should not return these values in the same
* list we would get conflicts and such with... it's just silly
*/
case PM_ERR_DISK_FULL:
i = data;
pkgsize = alpm_list_getdata(i);
i = alpm_list_next(i);
freespace = alpm_list_getdata(i);
printf(_(":: %.1f MB required, have %.1f MB"),
(double)(*pkgsize / (1024.0*1024.0)),
(double)(*freespace / (1024.0*1024.0)));
break;
default: default:
break; break;
} }

13
src/pacman/sync.c
View File

@ -619,7 +619,6 @@ int pacman_sync(alpm_list_t *targets)
/* Step 2: "compute" the transaction based on targets and flags */ /* Step 2: "compute" the transaction based on targets and flags */
if(alpm_trans_prepare(&data) == -1) { if(alpm_trans_prepare(&data) == -1) {
long long *pkgsize, *freespace;
fprintf(stderr, _("error: failed to prepare transaction (%s)\n"), fprintf(stderr, _("error: failed to prepare transaction (%s)\n"),
alpm_strerror(pm_errno)); alpm_strerror(pm_errno));
switch(pm_errno) { switch(pm_errno) {
@ -643,7 +642,7 @@ int pacman_sync(alpm_list_t *targets)
} }
printf("\n"); printf("\n");
} }
break; break;
case PM_ERR_CONFLICTING_DEPS: case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) { for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i); pmdepmissing_t *miss = alpm_list_getdata(i);
@ -651,15 +650,9 @@ int pacman_sync(alpm_list_t *targets)
printf(_(":: %s: conflicts with %s"), printf(_(":: %s: conflicts with %s"),
alpm_dep_get_target(miss), alpm_dep_get_name(miss)); alpm_dep_get_target(miss), alpm_dep_get_name(miss));
} }
break; break;
case PM_ERR_DISK_FULL:
pkgsize = alpm_list_getdata(data);
freespace = alpm_list_getdata(alpm_list_next(data));
printf(_(":: %.1f MB required, have %.1f MB"),
(double)(*pkgsize / 1048576.0), (double)(*freespace / 1048576.0));
break;
default: default:
break; break;
} }
retval = 1; retval = 1;
goto cleanup; goto cleanup;