From cb940620bcfa6ffc4f6303551e63164fe6c9428d Mon Sep 17 00:00:00 2001 From: Integral Date: Tue, 10 Dec 2024 21:10:35 +0800 Subject: [PATCH] fix: make dependency cycle a debug message --- lib/libalpm/deps.c | 6 +++--- test/pacman/tests/dependency-cycle-fixed-by-upgrade.py | 2 +- test/pacman/tests/sync012.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index d47d66bb..e0327b9b 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -181,13 +181,13 @@ static void _alpm_warn_dep_cycle(alpm_handle_t *handle, alpm_list_t *targets, } else { alpm_pkg_t *ancestorpkg = ancestor->data; alpm_pkg_t *childpkg = vertex->data; - _alpm_log(handle, ALPM_LOG_WARNING, _("dependency cycle detected:\n")); + _alpm_log(handle, ALPM_LOG_DEBUG, _("dependency cycle detected:\n")); if(reverse) { - _alpm_log(handle, ALPM_LOG_WARNING, + _alpm_log(handle, ALPM_LOG_DEBUG, _("%s will be removed after its %s dependency\n"), ancestorpkg->name, childpkg->name); } else { - _alpm_log(handle, ALPM_LOG_WARNING, + _alpm_log(handle, ALPM_LOG_DEBUG, _("%s will be installed before its %s dependency\n"), ancestorpkg->name, childpkg->name); } diff --git a/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py b/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py index dc042e5f..3d469005 100644 --- a/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py +++ b/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py @@ -23,7 +23,7 @@ sp3.depends = ["pkg1"] for p in sp1, sp2, sp3: self.addpkg2db("sync", p); -self.args = "-S %s %s %s" % (sp1.name, sp2.name, sp3.name) +self.args = "-S %s %s %s --debug" % (sp1.name, sp2.name, sp3.name) self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=pkg1|1-2") diff --git a/test/pacman/tests/sync012.py b/test/pacman/tests/sync012.py index 441e5d5e..35083008 100644 --- a/test/pacman/tests/sync012.py +++ b/test/pacman/tests/sync012.py @@ -12,7 +12,7 @@ sp3.depends = ["pkg1"] for p in sp1, sp2, sp3: self.addpkg2db("sync", p); -self.args = "-S %s" % sp1.name +self.args = "-S %s --debug" % sp1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg1")