snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

xbps: fix regression

This commit is contained in:
Duncaen 2020-01-31 16:35:44 +01:00
parent da6a1b5c2e
commit 51cb5aca84
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
srcpkgs/xbps/patches/regression-218.patch Normal file
View File

@ -0,0 +1,45 @@
commit 8637269b38d9cd59fe946dc797a455e3c8009ea0
Author: Duncan Overbruck <mail@duncano.de>
Date: Fri Jan 31 16:32:38 2020 +0100
lib/transaction_revdeps.c: fix provides/replaces #218
This reverts a change that solved another issue and marks the test case
for the other issue as expected failure.
The other issue is not as important as this, as it blocks updating a lot
of systems.
diff --git lib/transaction_revdeps.c lib/transaction_revdeps.c
index 39cc6d05..73edd21c 100644
--- lib/transaction_revdeps.c
+++ lib/transaction_revdeps.c
@@ -232,6 +232,16 @@ xbps_transaction_revdeps(struct xbps_handle *xhp, xbps_array_t pkgs)
free(pkgname);
continue;
}
+ /*
+ * Installed package conflicts with package
+ * in transaction being updated, check
+ * if a new version of this conflicting package
+ * is in the transaction.
+ */
+ if (xbps_find_pkg_in_array(pkgs, pkgname, "update")) {
+ free(pkgname);
+ continue;
+ }
free(pkgname);
broken_pkg(mdeps, curpkgver, pkgver, tract);
}
diff --git tests/xbps/libxbps/shell/install_test.sh tests/xbps/libxbps/shell/install_test.sh
index c0fe9a1a..eb30ba82 100644
--- tests/xbps/libxbps/shell/install_test.sh
+++ tests/xbps/libxbps/shell/install_test.sh
@@ -598,6 +598,7 @@ atf_test_case update_and_install
update_and_install_head() {
atf_set "descr" "Tests for pkg install: update installed version and install new from other repo"
+ atf_expect_fail "fix introduced a regression"
}
update_and_install_body() {

2
srcpkgs/xbps/template
View File

@ -1,7 +1,7 @@
# Template file for 'xbps'
pkgname=xbps
version=0.58
revision=2
revision=3
bootstrap=yes
build_style=configure
short_desc="XBPS package system utilities"