aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/main.c19
2 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6beac32..7969ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
+0.10.2c Jan 10, 2010
+ * fixed missing configuration option copying from the initial config
+ to the final configuration. --remove-obsolete and --retry were not
+ being honored.
+
0.10.2b Oct 17, 2009
* modified disk checking mechanism so that the working directory filesystem
is checked for downloads and then / is checked for the uncompressed size.
diff --git a/src/main.c b/src/main.c
index a63ac17..5ea705f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -229,18 +229,21 @@ int main( int argc, char *argv[] )
}
/* preserve existing command line options */
- global_config->download_only = initial_config->download_only;
+ global_config->disable_dep_check = initial_config->disable_dep_check;
global_config->dist_upgrade = initial_config->dist_upgrade;
- global_config->simulate = initial_config->simulate;
- global_config->no_prompt = initial_config->no_prompt;
- global_config->prompt = initial_config->prompt;
- global_config->re_install = initial_config->re_install;
+ global_config->dl_stats = initial_config->dl_stats;
+ global_config->download_only = initial_config->download_only;
+ global_config->ignore_dep = initial_config->ignore_dep;
global_config->ignore_excludes = initial_config->ignore_excludes;
global_config->no_md5_check = initial_config->no_md5_check;
- global_config->ignore_dep = initial_config->ignore_dep;
- global_config->disable_dep_check = initial_config->disable_dep_check;
+ global_config->no_prompt = initial_config->no_prompt;
+ global_config->no_upgrade = initial_config->no_upgrade;
global_config->print_uris = initial_config->print_uris;
- global_config->dl_stats = initial_config->dl_stats;
+ global_config->prompt = initial_config->prompt;
+ global_config->re_install = initial_config->re_install;
+ global_config->remove_obsolete = initial_config->remove_obsolete;
+ global_config->retry = initial_config->retry;
+ global_config->simulate = initial_config->simulate;
slapt_free_rc_config(initial_config);