aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2003-10-13 19:15:52 +0000
committerJason Woodward2003-10-13 19:15:52 +0000
commitf0b667d1d263726719a007c77dab0c5db3ea1098 (patch)
treee2171320537532d3b84810feceb4683f2f99f1f2
parentbcdc6fa90edb3a4555cced992d43023295136286 (diff)
downloadslapt-get-f0b667d1d263726719a007c77dab0c5db3ea1098.tar.gz
fixed bug with --interactive and --upgrade (not skipping transaction report)
moved Done prints for patch and checksum into check for success
-rw-r--r--src/action.c18
-rw-r--r--src/transaction.c2
2 files changed, 11 insertions, 9 deletions
diff --git a/src/action.c b/src/action.c
index aee23f6..829575c 100644
--- a/src/action.c
+++ b/src/action.c
@@ -243,11 +243,12 @@ void pkg_action_update(const rc_config *global_config){
#endif
patches_list_fh = open_file(PATCHES_LIST_L,"w+");
for(i = 0; i < global_config->sources.count; i++){
- get_mirror_data_from_source(patches_list_fh,global_config->sources.url[i],PATCHES_LIST);
+ if( get_mirror_data_from_source(patches_list_fh,global_config->sources.url[i],PATCHES_LIST) == 0 ){
+ #if USE_CURL_PROGRESS == 0
+ printf("Done\n");
+ #endif
+ }
}
- #if USE_CURL_PROGRESS == 0
- printf("Done\n");
- #endif
fclose(patches_list_fh);
/* download checksum file */
@@ -258,11 +259,12 @@ void pkg_action_update(const rc_config *global_config){
#endif
checksum_list_fh = open_file(CHECKSUM_FILE,"w+");
for(i = 0; i < global_config->sources.count; i++){
- get_mirror_data_from_source(checksum_list_fh,global_config->sources.url[i],CHECKSUM_FILE);
+ if( get_mirror_data_from_source(checksum_list_fh,global_config->sources.url[i],CHECKSUM_FILE) == 0 ){
+ #if USE_CURL_PROGRESS == 0
+ printf("Done\n");
+ #endif
+ }
}
- #if USE_CURL_PROGRESS == 0
- printf("Done\n");
- #endif
fclose(checksum_list_fh);
/* source listing to go here */
diff --git a/src/transaction.c b/src/transaction.c
index c70d687..a4f6fcf 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -44,7 +44,7 @@ int handle_transaction(const rc_config *global_config, transaction *tran){
if(
(tran->upgrade_pkgs->pkg_count > 0 || tran->remove_pkgs->pkg_count > 0)
&& (global_config->download_only == 0 && global_config->simulate == 0
- && global_config->no_prompt == 0 )
+ && global_config->no_prompt == 0 && global_config->interactive == 0 )
){
/* show pkgs to install */