aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--FAQ3
-rw-r--r--src/configuration.c2
-rw-r--r--src/configuration.h2
-rw-r--r--src/main.c16
-rw-r--r--src/package.c2
-rw-r--r--src/transaction.c2
7 files changed, 17 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ed3ed5..eeafc13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
-0.9.9c Oct 03, 2004
+0.9.9c Oct 13, 2004
+ * changed --disable-dep-check to --no-dep
+ * changed --no-dep to --ignore-dep
* merged Michel Hermier's purge_old_cached_pkgs() patch with some modifications
* merged Michel Hermier's ask_yes_no() patch to common.[ch] and transation.c
* added init_pkg_action_args() and free_pkg_action_args()
diff --git a/FAQ b/FAQ
index 6ede0a6..c115cc5 100644
--- a/FAQ
+++ b/FAQ
@@ -701,7 +701,8 @@ Frequenty Asked Questions:
This does not apply to dependencies. If a dependency of a specified package
is detected, it is checked against the EXCLUDE list. If excluded, the
- dependency check for the specified package fails. Override this with --no-dep.
+ dependency check for the specified package fails. Override this with
+ --ignore-dep.
31. What about package conflicts? How can I specify a conflict for my package?
diff --git a/src/configuration.c b/src/configuration.c
index 33c3c57..d4555a4 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -42,7 +42,7 @@ rc_config *read_rc_config(const char *file_name){
global_config->ignore_excludes = 0;
global_config->no_md5_check = 0;
global_config->dist_upgrade = 0;
- global_config->no_dep = 0;
+ global_config->ignore_dep = 0;
global_config->disable_dep_check = 0;
global_config->print_uris = 0;
global_config->dl_stats = 0;
diff --git a/src/configuration.h b/src/configuration.h
index a4e80db..e677f86 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -44,7 +44,7 @@ struct _configuration {
struct exclude_list *exclude_list;
int ignore_excludes;
int no_md5_check;
- int no_dep;
+ int ignore_dep;
int disable_dep_check;
int print_uris;
int dl_stats;
diff --git a/src/main.c b/src/main.c
index a7f0425..2f7c6b7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -49,8 +49,8 @@ int main( int argc, char *argv[] ){
{"dist-upgrade",0, 0, 'h'},
{"help",0, 0, 'l'},
{"h",0, 0, 'l'},
- {"no-dep",0, 0, 'p'},
- {"disable-dep-check",0, 0, 'q'},
+ {"ignore-dep",0, 0, 'p'},
+ {"no-dep",0, 0, 'q'},
{"print-uris",0, 0, 'P'},
{"show-stats",0, 0, 'S'},
{"S",0, 0, 'S'},
@@ -135,10 +135,10 @@ int main( int argc, char *argv[] ){
case 'l': /* help */
usage();
exit(1);
- case 'p': /* no-dep */
- global_config->no_dep = 1;
+ case 'p': /* ignore-dep */
+ global_config->ignore_dep = 1;
break;
- case 'q': /* disable-dep-check */
+ case 'q': /* no-dep */
global_config->disable_dep_check = 1;
break;
case 'P': /* print-uris */
@@ -162,7 +162,7 @@ int main( int argc, char *argv[] ){
global_config->re_install = tmp_gc->re_install;
global_config->ignore_excludes = tmp_gc->ignore_excludes;
global_config->no_md5_check = tmp_gc->no_md5_check;
- global_config->no_dep = tmp_gc->no_dep;
+ global_config->ignore_dep = tmp_gc->ignore_dep;
global_config->disable_dep_check = tmp_gc->disable_dep_check;
global_config->print_uris = tmp_gc->print_uris;
global_config->dl_stats = tmp_gc->dl_stats;
@@ -300,8 +300,8 @@ void usage(void){
printf(" --reinstall - %s\n",_("re-install the pkg"));
printf(" --ignore-excludes - %s\n",_("install/upgrade excludes"));
printf(" --no-md5 - %s\n",_("do not perform md5 check sum"));
- printf(" --no-dep - %s\n",_("ignore dependency failures"));
- printf(" --disable-dep-check - %s\n",_("skip dependency check"));
+ printf(" --no-dep - %s\n",_("skip dependency check"));
+ printf(" --ignore-dep - %s\n",_("ignore dependency failures"));
printf(" --print-uris - %s\n",_("print URIs only, do not download"));
printf(" --show-stats|-S - %s\n",_("show download statistics"));
printf(" --config [] - %s\n",_("specify alternate slapt-getrc location"));
diff --git a/src/package.c b/src/package.c
index 4051d1e..c6c89cc 100644
--- a/src/package.c
+++ b/src/package.c
@@ -1201,7 +1201,7 @@ static struct pkg_list *lookup_pkg_dependencies(const rc_config *global_config,s
}/* end for loop */
- }else if( tmp_pkgs_deps->pkg_count == -1 && global_config->no_dep == 0 ){
+ }else if( tmp_pkgs_deps->pkg_count == -1 && global_config->ignore_dep == 0 ){
/* don't call free_pkg_list as this list is made up of pointers */
/* free_pkg_list(tmp_pkgs_deps); */
free(tmp_pkgs_deps->pkgs);
diff --git a/src/transaction.c b/src/transaction.c
index ad39581..d96e21b 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -482,7 +482,7 @@ int add_deps_to_trans(const rc_config *global_config, transaction *tran, struct
/* check to see if there where issues with dep checking */
/* exclude the package if dep check barfed */
- if( (deps->pkg_count == -1) && (global_config->no_dep == 0) ){
+ if( (deps->pkg_count == -1) && (global_config->ignore_dep == 0) ){
printf("Excluding %s, use --no-dep to override\n",pkg->name);
add_exclude_to_transaction(tran,pkg);
free(deps->pkgs);