diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2015-09-15 07:08:16 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-09-19 07:12:35 +0200 |
| commit | 75fe6ef104b1071bf763354177f3c4339c1c7854 (patch) | |
| tree | 2d09b785e0e2b471e9e0d598e5b46a5774a83034 | |
| parent | 486643083c853a1d541d6f8e93c68b7a542f5a2d (diff) | |
| download | pacman-75fe6ef104b1071bf763354177f3c4339c1c7854.tar.gz pacman-75fe6ef104b1071bf763354177f3c4339c1c7854.tar.xz | |
sortbydeps: skip local packages being updated
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/deps.c | 11 | ||||
| -rw-r--r-- | test/pacman/tests/TESTS | 1 | ||||
| -rw-r--r-- | test/pacman/tests/dependency-cycle-fixed-by-upgrade.py | 32 |
3 files changed, 41 insertions, 3 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index daab9c3f..34ac8d39 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -105,7 +105,13 @@ static alpm_list_t *dep_graph_init(alpm_handle_t *handle, alpm_list_t *i, *j; alpm_list_t *vertices = NULL; alpm_list_t *localpkgs = alpm_list_diff( - alpm_db_get_pkgcache(handle->db_local), ignore, _alpm_pkg_cmp); + alpm_db_get_pkgcache(handle->db_local), targets, _alpm_pkg_cmp); + + if(ignore) { + alpm_list_t *oldlocal = localpkgs; + localpkgs = alpm_list_diff(oldlocal, ignore, _alpm_pkg_cmp); + alpm_list_free(oldlocal); + } /* We create the vertices */ for(i = targets; i; i = i->next) { @@ -137,8 +143,7 @@ static alpm_list_t *dep_graph_init(alpm_handle_t *handle, alpm_graph_t *vertex_j = _alpm_graph_new(); vertex_j->data = (void *)j->data; vertices = alpm_list_add(vertices, vertex_j); - vertex_i->children = - alpm_list_add(vertex_i->children, vertex_j); + vertex_i->children = alpm_list_add(vertex_i->children, vertex_j); localpkgs = alpm_list_remove_item(localpkgs, j); free(j); } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 3ff0b0c2..cce0d582 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -14,6 +14,7 @@ TESTS += test/pacman/tests/depconflict100.py TESTS += test/pacman/tests/depconflict110.py TESTS += test/pacman/tests/depconflict111.py TESTS += test/pacman/tests/depconflict120.py +TESTS += test/pacman/tests/dependency-cycle-fixed-by-upgrade.py TESTS += test/pacman/tests/deptest001.py TESTS += test/pacman/tests/dummy001.py TESTS += test/pacman/tests/epoch001.py diff --git a/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py b/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py new file mode 100644 index 00000000..dc042e5f --- /dev/null +++ b/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py @@ -0,0 +1,32 @@ +self.description = "Circular dependency fixed by removed dependency" + +lp1 = pmpkg("pkg1", "1-1") +lp1.depends = ["pkg2"] + +lp2 = pmpkg("pkg2", "1-1") +lp2.depends = ["pkg3"] + +lp3 = pmpkg("pkg3", "1-1") +lp3.depends = ["pkg1"] + +for p in lp1, lp2, lp3: + self.addpkg2db("local", p); + +sp1 = pmpkg("pkg1", "1-2") +sp1.depends = ["pkg2"] + +sp2 = pmpkg("pkg2", "1-2") + +sp3 = pmpkg("pkg3", "1-2") +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.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1-2") +self.addrule("PKG_VERSION=pkg2|1-2") +self.addrule("PKG_VERSION=pkg3|1-2") +self.addrule("!PACMAN_OUTPUT=dependency cycle detected") |