aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/action.c10
-rw-r--r--src/transaction.c2
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0332cc3..dcd2309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-0.9.10e Oct 10, 2005
+0.9.10e Oct 14, 2005
+ * removed duplicate slapt_add_exclude_to_transaction() calls
* fixed hardcoded mirror setting in PACKAGES.TXT regression
* updated Portuguese_Portugal translation from Miguel
diff --git a/src/action.c b/src/action.c
index 43d8d82..b71abbc 100644
--- a/src/action.c
+++ b/src/action.c
@@ -102,6 +102,8 @@ void slapt_pkg_action_install(const slapt_rc_config *global_config,
slapt_add_install_to_transaction(tran,pkg);
} else {
+ printf("Excluding %s, use --ignore-dep to override\n",
+ pkg->name);
slapt_add_exclude_to_transaction(tran,pkg);
}
@@ -125,6 +127,8 @@ void slapt_pkg_action_install(const slapt_rc_config *global_config,
slapt_add_upgrade_to_transaction(tran,installed_pkg,pkg);
} else {
+ printf("Excluding %s, use --ignore-dep to override\n",
+ pkg->name);
slapt_add_exclude_to_transaction(tran,pkg);
}
@@ -503,6 +507,8 @@ void slapt_pkg_action_upgrade_all(const slapt_rc_config *global_config)
slapt_add_install_to_transaction(tran,slapt_upgrade_pkg);
} else {
/* otherwise exclude */
+ printf("Excluding %s, use --ignore-dep to override\n",
+ slapt_upgrade_pkg->name);
slapt_add_exclude_to_transaction(tran,slapt_upgrade_pkg);
}
@@ -529,6 +535,8 @@ void slapt_pkg_action_upgrade_all(const slapt_rc_config *global_config)
slapt_upgrade_pkg);
} else {
/* otherwise exclude */
+ printf("Excluding %s, use --ignore-dep to override\n",
+ slapt_upgrade_pkg->name);
slapt_add_exclude_to_transaction(tran,slapt_upgrade_pkg);
}
}
@@ -646,6 +654,8 @@ void slapt_pkg_action_upgrade_all(const slapt_rc_config *global_config)
update_pkg);
} else {
/* otherwise exclude */
+ printf("Excluding %s, use --ignore-dep to override\n",
+ update_pkg->name);
slapt_add_exclude_to_transaction(tran,update_pkg);
}
}
diff --git a/src/transaction.c b/src/transaction.c
index 3d01e66..8cf33ec 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -779,8 +779,6 @@ int slapt_add_deps_to_trans(const slapt_rc_config *global_config,
if ((dep_return == -1) && (global_config->ignore_dep == SLAPT_FALSE) &&
(slapt_get_exact_pkg(tran->exclude_pkgs,pkg->name,pkg->version) == NULL)
) {
- printf("Excluding %s, use --ignore-dep to override\n",pkg->name);
- slapt_add_exclude_to_transaction(tran,pkg);
slapt_free_pkg_list(deps);
return -1;
}