diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-17 23:01:57 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-17 23:01:57 +0100 |
| commit | c7bcaeb7e82b9b74ab9734863827ff98db2b1fdd (patch) | |
| tree | f64639dc3dc966e8f74a5ff1f783cdb0cd3ae5f2 /lib/libalpm/conflict.c | |
| parent | 4e8220fae7f90164313cf1e629721d6436477796 (diff) | |
| download | pacman-c7bcaeb7e82b9b74ab9734863827ff98db2b1fdd.tar.gz pacman-c7bcaeb7e82b9b74ab9734863827ff98db2b1fdd.tar.xz | |
fixed detection for duplicate entries in list of deps/conflicts
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 9f6ddecb..749cad24 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -75,7 +75,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) miss->depend.version[0] = '\0'; STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, dp->name, PKG_NAME_LEN); - if(!pm_list_is_in(miss, baddeps)) { + if(!dep_isin(miss, baddeps)) { _alpm_log(PM_LOG_DEBUG, "checkconflict: targs vs db: adding %s as a conflict for %s", dp->name, tp->name); baddeps = pm_list_add(baddeps, miss); @@ -94,7 +94,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) miss->depend.version[0] = '\0'; STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, dp->name, PKG_NAME_LEN); - if(!pm_list_is_in(miss, baddeps)) { + if(!dep_isin(miss, baddeps)) { _alpm_log(PM_LOG_DEBUG, "checkconflict: targs vs db: adding %s as a conflict for %s", dp->name, tp->name); baddeps = pm_list_add(baddeps, miss); @@ -120,7 +120,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) miss->depend.version[0] = '\0'; STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, otp->name, PKG_NAME_LEN); - if(!pm_list_is_in(miss, baddeps)) { + if(!dep_isin(miss, baddeps)) { _alpm_log(PM_LOG_DEBUG, "checkconflict: targs vs targs: adding %s as a conflict for %s", otp->name, tp->name); baddeps = pm_list_add(baddeps, miss); @@ -138,7 +138,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) miss->depend.version[0] = '\0'; STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, otp->name, PKG_NAME_LEN); - if(!pm_list_is_in(miss, baddeps)) { + if(!dep_isin(miss, baddeps)) { _alpm_log(PM_LOG_DEBUG, "checkconflict: targs vs targs: adding %s as a conflict for %s", otp->name, tp->name); baddeps = pm_list_add(baddeps, miss); @@ -165,7 +165,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) miss->depend.version[0] = '\0'; STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, info->name, PKG_NAME_LEN); - if(!pm_list_is_in(miss, baddeps)) { + if(!dep_isin(miss, baddeps)) { _alpm_log(PM_LOG_DEBUG, "checkconflict: db vs targs: adding %s as a conflict for %s", info->name, tp->name); baddeps = pm_list_add(baddeps, miss); @@ -185,7 +185,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) miss->depend.version[0] = '\0'; STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, info->name, PKG_NAME_LEN); - if(!pm_list_is_in(miss, baddeps)) { + if(!dep_isin(miss, baddeps)) { _alpm_log(PM_LOG_DEBUG, "checkconflict: db vs targs: adding %s as a conflict for %s", info->name, tp->name); baddeps = pm_list_add(baddeps, miss); |