emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of system virtualpkg.d support (<prefix>/share/xbps/virtualpkg.d).

Browse Source 
Binary packages do not need to provide those virtualpkg configuration files
anymore; all vpkg info is now collected from pkgdb.
This commit is contained in:
Juan RP
2014-11-04 11:17:27 +01:00
parent 59781f4e91
commit 595136704e
6 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/xbps/libxbps/pkgdb/main.c
View File

@@ -134,7 +134,7 @@ ATF_TC_BODY(pkgdb_get_pkg_revdeps_test, tc)
xh.flags = XBPS_FLAG_DEBUG;
ATF_REQUIRE_EQ(xbps_init(&xh), 0);
res = xbps_pkgdb_get_pkg_revdeps(&xh, "mixed");
res = xbps_pkgdb_get_pkg_revdeps(&xh, "virtual-mixed");
ATF_REQUIRE_EQ(xbps_object_type(res), XBPS_TYPE_ARRAY);
pstr = xbps_string_create();

6
tests/xbps/libxbps/shell/vpkg_test.sh
View File

@@ -51,8 +51,6 @@ vpkg01_head() {
vpkg01_body() {
mkdir some_repo
mkdir -p pkg_{A,B,C,D}/usr/bin
mkdir -p pkg_C/usr/share/xbps/virtualpkg.d
echo "virtualpkg=A-1.0_1:C" > pkg_C/usr/share/xbps/virtualpkg.d/C.conf
cd some_repo
xbps-create -A noarch -n A-1.0_1 -s "A pkg" ../pkg_A
atf_check_equal $? 0
@@ -103,13 +101,9 @@ vpkg02_body() {
cd some_repo
mkdir -p pkg_gawk/usr/share/xbps/virtualpkg.d
echo "virtualpkg=awk-1.0_1:gawk" > pkg_gawk/usr/share/xbps/virtualpkg.d/gawk.conf
xbps-create -A noarch -n gawk-1.1_1 -s "gawk pkg" --provides "awk-1.0_1" --replaces "awk>=0" ../pkg_gawk
atf_check_equal $? 0
mkdir -p pkg_busybox/usr/share/xbps/virtualpkg.d
echo "virtualpkg=awk-1.0_1:busybox" > pkg_busybox/usr/share/xbps/virtualpkg.d/busybox.conf
xbps-create -A noarch -n busybox-1.0_1 -s "busybox awk" --provides "awk-1.0_1" --replaces "awk>=0" ../pkg_busybox
atf_check_equal $? 0