Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2006-01-08 22:06:19 +0000
committerJudd Vinet <judd@archlinux.org>2006-01-08 22:06:19 +0000
commit6866b8ce6f5d5cce8dd106fdcb0404e521852382 (patch)
tree51f5d89994c198a6185c3da153f5c3e5f57f9593
parent38180d52317316317e9e6199626a422ebe71f350 (diff)
removed old/disable provides-conflict checking code
-rw-r--r--lib/libalpm/deps.c30
1 files changed, 1 insertions, 29 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index b2d8a7a3..05a926d0 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -303,8 +303,7 @@ PMList *checkdeps(pmdb_t *db, unsigned char op, PMList *packages)
FREE(miss);
}
} else {
- /* see if info and tp both provide something that info wants to
- * exclusively provide (ie, conflicts&provides package X) */
+ /* see if the db package conflicts with something we provide */
PMList *m;
for(m = info->conflicts; m; m = m->next) {
PMList *n;
@@ -330,33 +329,6 @@ PMList *checkdeps(pmdb_t *db, unsigned char op, PMList *packages)
}
}
- /* PROVIDES -- check to see if another package already provides what
- * we offer
- */
- /* XXX: disabled -- we allow multiple packages to provide the same thing.
- * list packages in conflicts if they really do conflict.
- for(j = tp->provides; j; j = j->next) {
- PMList *provs = whatprovides(db, j->data);
- for(k = provs; k; k = k->next) {
- if(!strcmp(tp->name, k->data->name)) {
- // this is the same package -- skip it
- continue;
- }
- // we treat this just like a conflict
- MALLOC(miss, sizeof(pmdepmissing_t));
- miss->type = PM_DEP_TYPE_CONFLICT;
- miss->depend.mod = PM_DEP_MOD_ANY;
- miss->depend.version[0] = '\0';
- STRNCPY(miss->target, tp->name, PKG_NAME_LEN);
- STRNCPY(miss->depend.name, k->data, PKG_NAME_LEN);
- if(!pm_list_is_in(baddeps, miss)) {
- baddeps = pm_list_add(baddeps, miss);
- }
- k->data = NULL;
- }
- FREELIST(provs);
- }*/
-
/* DEPENDENCIES -- look for unsatisfied dependencies */
for(j = tp->depends; j; j = j->next) {
/* split into name/version pairs */