summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2007-11-21 01:03:08 +0100
committerDan McGee <dan@archlinux.org>2007-11-21 10:25:52 -0600
commit7cf28a75959eac03a12c471a01f0a6111fbbd0ce (patch)
tree51101a72c36fc207ddbdbdd897ccb1fb6395eb24
parent83fa6aa2896c0c940e8bf5b7499abc7ef955e658 (diff)
downloadpacman-7cf28a75959eac03a12c471a01f0a6111fbbd0ce.tar.xz
Improved 'dependency cycle' warning
From now on libalpm informs user about packages which will be installed/removed in wrong order. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/deps.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 0c79a25b..ac07c0b7 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -187,7 +187,14 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode)
vertex = nextchild;
}
else if(nextchild->state == -1) {
- _alpm_log(PM_LOG_WARNING, _("dependency cycle detected\n"));
+ pmpkg_t *vertexpkg = vertex->data;
+ pmpkg_t *childpkg = nextchild->data;
+ _alpm_log(PM_LOG_WARNING, _("dependency cycle detected:\n"));
+ if(mode == PM_TRANS_TYPE_REMOVE) {
+ _alpm_log(PM_LOG_WARNING, _("%s will be removed after its %s dependency\n"), vertexpkg->name, childpkg->name);
+ } else {
+ _alpm_log(PM_LOG_WARNING, _("%s will be installed before its %s dependency\n"), vertexpkg->name, childpkg->name);
+ }
}
}
if(!found) {