Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-06-13 00:31:01 -0400
committerDan McGee <dan@archlinux.org>2007-06-13 00:31:01 -0400
commit5e774d72b0ac7777aada8271e2162d764d4f0db4 (patch)
tree7b054ad645674bc9a2f2b34eb4cd2634c71f17fd
parentcaf6c326ec9a376ffb794051cd09c40abc135fda (diff)
Remove some more diskspace checking holdover stuff
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/alpm.h1
-rw-r--r--lib/libalpm/error.c2
-rw-r--r--src/pacman/add.c14
-rw-r--r--src/pacman/sync.c13
4 files changed, 3 insertions, 27 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index e6c905fa..98115241 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -443,7 +443,6 @@ enum _pmerrno_t {
PM_ERR_USER_ABORT,
PM_ERR_INTERNAL_ERROR,
PM_ERR_LIBARCHIVE_ERROR,
- PM_ERR_DISK_FULL,
PM_ERR_DB_SYNC,
PM_ERR_RETRIEVE,
PM_ERR_PKG_HOLD,
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index 67d8b1f2..29ee61ad 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -133,8 +133,6 @@ const char SYMEXPORT *alpm_strerror(int err)
return _("internal error");
case PM_ERR_LIBARCHIVE_ERROR:
return _("libarchive error");
- case PM_ERR_DISK_FULL:
- return _("not enough space on disk");
case PM_ERR_PKG_HOLD:
/* TODO wow this is not descriptive at all... what does this mean? */
return _("not confirmed");
diff --git a/src/pacman/add.c b/src/pacman/add.c
index d5d83d28..39da624b 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -117,8 +117,6 @@ int pacman_add(alpm_list_t *targets)
/* Step 2: "compute" the transaction based on targets and flags */
/* TODO: No, compute nothing. This is stupid. */
if(alpm_trans_prepare(&data) == -1) {
- long long *pkgsize, *freespace;
-
fprintf(stderr, _("error: failed to prepare transaction (%s)\n"),
alpm_strerror(pm_errno));
switch(pm_errno) {
@@ -173,18 +171,6 @@ int pacman_add(alpm_list_t *targets)
}
printf(_("\nerrors occurred, no packages were upgraded.\n"));
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:
break;
}
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index c2c4f37c..b36726ae 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -619,7 +619,6 @@ int pacman_sync(alpm_list_t *targets)
/* Step 2: "compute" the transaction based on targets and flags */
if(alpm_trans_prepare(&data) == -1) {
- long long *pkgsize, *freespace;
fprintf(stderr, _("error: failed to prepare transaction (%s)\n"),
alpm_strerror(pm_errno));
switch(pm_errno) {
@@ -643,7 +642,7 @@ int pacman_sync(alpm_list_t *targets)
}
printf("\n");
}
- break;
+ break;
case PM_ERR_CONFLICTING_DEPS:
for(i = data; i; i = alpm_list_next(i)) {
pmdepmissing_t *miss = alpm_list_getdata(i);
@@ -651,15 +650,9 @@ int pacman_sync(alpm_list_t *targets)
printf(_(":: %s: conflicts with %s"),
alpm_dep_get_target(miss), alpm_dep_get_name(miss));
}
- 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;
+ break;
default:
- break;
+ break;
}
retval = 1;
goto cleanup;