From 719ff509c4c926c283fe759cf53846d91939d8ac Mon Sep 17 00:00:00 2001 From: Aurelien Foret Date: Tue, 17 Jan 2006 21:18:12 +0000 Subject: reworked log messages --- lib/libalpm/conflict.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/libalpm') 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 { -- cgit v1.2.3-70-g09d2