diff options
| author | Robey Pointer <robey@src.gnome.org> | 2000-11-07 05:20:24 +0000 |
|---|---|---|
| committer | Robey Pointer <robey@src.gnome.org> | 2000-11-07 05:20:24 +0000 |
| commit | dbee76d1563dd372dc77a72af6cbee59cf716757 (patch) | |
| tree | d267fde370a66c34c2285b6c3014db6904e16aaf | |
| parent | e9ef515e115448f3bbbf1c5de4fdb4ed2220c69a (diff) | |
| download | nautilus-dbee76d1563dd372dc77a72af6cbee59cf716757.tar.gz | |
Fix deliberate malicious error in Eskil's last fix (need to check required
* components/services/install/lib/eazel-install-logic.c:
(eazel_install_do_file_conflict_check):
Fix deliberate malicious error in Eskil's last fix (need to check
required *AND* breaks lists, not either/or).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | components/services/install/lib/eazel-install-logic.c | 3 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2000-11-06 Robey Pointer <robey@eazel.com> + + * components/services/install/lib/eazel-install-logic.c: + (eazel_install_do_file_conflict_check): + + Fix deliberate malicious error in Eskil's last fix (need to check + required *AND* breaks lists, not either/or). + 2000-11-06 Ramiro Estrugo <ramiro@eazel.com> * Makefile.am: diff --git a/components/services/install/lib/eazel-install-logic.c b/components/services/install/lib/eazel-install-logic.c index f417c944e..6bea7a80e 100644 --- a/components/services/install/lib/eazel-install-logic.c +++ b/components/services/install/lib/eazel-install-logic.c @@ -2013,7 +2013,8 @@ eazel_install_do_file_conflict_check (EazelInstall *service, (*requirements) = g_list_prepend (*requirements, req); } } - } else { + } + if (breaks) { GList *break_iterator; gboolean fail_it = FALSE; for (break_iterator = breaks; break_iterator; glist_step (break_iterator)) { |