| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-17 21:18:12 +0000 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-17 21:18:12 +0000 |
| commit | 719ff509c4c926c283fe759cf53846d91939d8ac (patch) | |
| tree | 6900213502884f6ddb4da0597baf4d448ad1465a | |
| parent | 39b6d552c67a88cc17636f974a4061755955622e (diff) | |
| -rw-r--r-- | lib/libalpm/conflict.c | 12 |
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index a9e7a963..9f6ddecb 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -76,7 +76,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, dp->name, PKG_NAME_LEN); if(!pm_list_is_in(miss, baddeps)) { - _alpm_log(PM_LOG_DEBUG, "checkdeps: targs vs db: adding %s as a conflict for %s", + _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); } else { @@ -95,7 +95,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, dp->name, PKG_NAME_LEN); if(!pm_list_is_in(miss, baddeps)) { - _alpm_log(PM_LOG_DEBUG, "checkdeps: targs vs db: adding %s as a conflict for %s", + _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); } else { @@ -121,7 +121,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, otp->name, PKG_NAME_LEN); if(!pm_list_is_in(miss, baddeps)) { - _alpm_log(PM_LOG_DEBUG, "checkdeps: targs vs targs: adding %s as a conflict for %s", + _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); } else { @@ -139,7 +139,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, otp->name, PKG_NAME_LEN); if(!pm_list_is_in(miss, baddeps)) { - _alpm_log(PM_LOG_DEBUG, "checkdeps: targs vs targs: adding %s as a conflict for %s", + _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); } else { @@ -166,7 +166,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, info->name, PKG_NAME_LEN); if(!pm_list_is_in(miss, baddeps)) { - _alpm_log(PM_LOG_DEBUG, "checkdeps: db vs targs: adding %s as a conflict for %s", + _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); } else { @@ -186,7 +186,7 @@ PMList *checkconflicts(pmdb_t *db, PMList *packages) STRNCPY(miss->target, tp->name, PKG_NAME_LEN); STRNCPY(miss->depend.name, info->name, PKG_NAME_LEN); if(!pm_list_is_in(miss, baddeps)) { - _alpm_log(PM_LOG_DEBUG, "checkdeps: db vs targs: adding %s as a conflict for %s", + _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); } else { |