aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2006-07-29 13:45:24 +0000
committerJason Woodward2006-07-29 13:45:24 +0000
commitdf364386c2737e727170c939c28477398f4fbc32 (patch)
treea4646632a108c39685c2fe45f24d67a34c5266bc
parente7e9c5ac2741e3e39713556014dabee586b7ca3c (diff)
downloadslapt-get-0.9.11e.tar.gz
show disk space warning *after* showing how much is to be downloaded0.9.11e
-rw-r--r--ChangeLog3
-rw-r--r--src/transaction.c17
2 files changed, 11 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 9897ad9..df7448f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.9.11e Jul 27, 2006
+0.9.11e Jul 29, 2006
+ * show disk space warning *after* showing how much is to be downloaded
* suppress the warning when opening the ChangeLog.txt fails
(for installed packages)
* --remove-obsolete now works with --remove as well as --dist-upgrade
diff --git a/src/transaction.c b/src/transaction.c
index 2825be9..f6585cc 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -232,14 +232,6 @@ int slapt_handle_transaction (const slapt_rc_config *global_config,
if (need_to_download_size < 0)
need_to_download_size = 0;
- if (disk_space(global_config,need_to_download_size+uncompressed_size) != 0) {
- printf(
- gettext("You don't have enough free space in %s\n"),
- global_config->working_dir
- );
- exit(EXIT_FAILURE);
- }
-
if (already_download_size > 0) {
printf(gettext("Need to get %.1d%s/%.1d%s of archives.\n"),
(need_to_download_size > 1024) ? need_to_download_size / 1024
@@ -254,6 +246,15 @@ int slapt_handle_transaction (const slapt_rc_config *global_config,
(download_size > 1024) ? "MB" : "kB"
);
}
+
+ if (disk_space(global_config,need_to_download_size+uncompressed_size) != 0) {
+ printf(
+ gettext("You don't have enough free space in %s\n"),
+ global_config->working_dir
+ );
+ exit(EXIT_FAILURE);
+ }
+
}
if (tran->upgrade_pkgs->pkg_count > 0 || tran->remove_pkgs->pkg_count > 0 ||