bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: make dependency cycle a debug message

Browse source
This commit is contained in:
Integral 2024-12-10 21:10:35 +08:00
parent dd55afad68
commit cb940620bc
No known key found for this signature in database
GPG key ID: 06313911057DD5A8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libalpm/deps.c
View file

@ -181,13 +181,13 @@ static void _alpm_warn_dep_cycle(alpm_handle_t *handle, alpm_list_t *targets,
} else { } else {
alpm_pkg_t *ancestorpkg = ancestor->data; alpm_pkg_t *ancestorpkg = ancestor->data;
alpm_pkg_t *childpkg = vertex->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) { if(reverse) {
_alpm_log(handle, ALPM_LOG_WARNING, _alpm_log(handle, ALPM_LOG_DEBUG,
_("%s will be removed after its %s dependency\n"), _("%s will be removed after its %s dependency\n"),
ancestorpkg->name, childpkg->name); ancestorpkg->name, childpkg->name);
} else { } else {
_alpm_log(handle, ALPM_LOG_WARNING, _alpm_log(handle, ALPM_LOG_DEBUG,
_("%s will be installed before its %s dependency\n"), _("%s will be installed before its %s dependency\n"),
ancestorpkg->name, childpkg->name); ancestorpkg->name, childpkg->name);
} }

2
test/pacman/tests/dependency-cycle-fixed-by-upgrade.py
View file

@ -23,7 +23,7 @@ sp3.depends = ["pkg1"]
for p in sp1, sp2, sp3: for p in sp1, sp2, sp3:
self.addpkg2db("sync", p); 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("PACMAN_RETCODE=0")
self.addrule("PKG_VERSION=pkg1|1-2") self.addrule("PKG_VERSION=pkg1|1-2")

2
test/pacman/tests/sync012.py
View file

@ -12,7 +12,7 @@ sp3.depends = ["pkg1"]
for p in sp1, sp2, sp3: for p in sp1, sp2, sp3:
self.addpkg2db("sync", p); self.addpkg2db("sync", p);
self.args = "-S %s" % sp1.name self.args = "-S %s --debug" % sp1.name
self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_RETCODE=0")
self.addrule("PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg1")