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

xbps-query: list unavailable repositories in -L mode

Browse Source
This commit is contained in:
Piotr Wójcik 2021-12-04 23:27:02 +01:00 committed by Duncan Overbruck
parent 49bd3d62b5
commit ce4fd6a63c
No known key found for this signature in database
GPG Key ID: 335C1D17EC3D6E35
4 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/xbps-query/list.c
View File

@ -23,6 +23,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
@ -178,8 +179,8 @@ list_pkgs_pkgdb(struct xbps_handle *xhp)
return xbps_pkgdb_foreach_cb(xhp, list_pkgs_in_dict, &lpc); return xbps_pkgdb_foreach_cb(xhp, list_pkgs_in_dict, &lpc);
} }
static int static void
repo_list_uri_cb(struct xbps_repo *repo, void *arg UNUSED, bool *done UNUSED) repo_list_uri(struct xbps_repo *repo)
{ {
const char *signedby = NULL; const char *signedby = NULL;
uint16_t pubkeysize = 0; uint16_t pubkeysize = 0;
@ -204,19 +205,29 @@ repo_list_uri_cb(struct xbps_repo *repo, void *arg UNUSED, bool *done UNUSED)
if (hexfp) if (hexfp)
free(hexfp); free(hexfp);
} }
return 0; }
static void
repo_list_uri_err(const char *repouri)
{
printf("%5zd %s (RSA maybe-signed)\n", (ssize_t) -1, repouri);
} }
int int
repo_list(struct xbps_handle *xhp) repo_list(struct xbps_handle *xhp)
{ {
int rv; struct xbps_repo *repo = NULL;
const char *repouri = NULL;
rv = xbps_rpool_foreach(xhp, repo_list_uri_cb, NULL); for (unsigned int i = 0; i < xbps_array_count(xhp->repositories); i++) {
if (rv != 0 && rv != ENOTSUP) { xbps_array_get_cstring_nocopy(xhp->repositories, i, &repouri);
fprintf(stderr, "Failed to initialize rpool: %s\n", repo = xbps_repo_open(xhp, repouri);
strerror(rv)); if (repo) {
return rv; repo_list_uri(repo);
xbps_repo_close(repo);
} else {
repo_list_uri_err(repouri);
}
} }
return 0; return 0;
} }

1
tests/xbps/xbps-query/Kyuafile
View File

@ -2,5 +2,6 @@ syntax("kyuafile", 1)
test_suite("xbps-query") test_suite("xbps-query")
atf_test_program{name="ignore_repos_test"} atf_test_program{name="ignore_repos_test"}
atf_test_program{name="list_test"}
atf_test_program{name="remote_test"} atf_test_program{name="remote_test"}
atf_test_program{name="query_test"} atf_test_program{name="query_test"}

2
tests/xbps/xbps-query/Makefile
View File

@ -1,7 +1,7 @@
TOPDIR = ../../.. TOPDIR = ../../..
-include $(TOPDIR)/config.mk -include $(TOPDIR)/config.mk
TESTSHELL = ignore_repos_test remote_test query_test TESTSHELL = ignore_repos_test list_test remote_test query_test
TESTSSUBDIR = xbps/xbps-query TESTSSUBDIR = xbps/xbps-query
EXTRA_FILES = Kyuafile EXTRA_FILES = Kyuafile

28
tests/xbps/xbps-query/list_test.sh Normal file
View File

@ -0,0 +1,28 @@
#! /usr/bin/env atf-sh
# Test that xbps-query(1) list modes work as expected
atf_test_case list_repos
list_repos_head() {
atf_set "descr" "xbps-query(1) -L"
}
list_repos_body() {
mkdir -p some_repo pkg_A/bin
touch pkg_A/bin/file
cd some_repo
xbps-create -A noarch -n foo-1.0_1 -s "foo pkg" ../pkg_A
atf_check_equal $? 0
xbps-create -A noarch -n baz-1.0_1 -s "baz pkg" ../pkg_A
atf_check_equal $? 0
xbps-rindex -d -a $PWD/*.xbps
atf_check_equal $? 0
rm -f *.xbps
cd ..
output="$(xbps-query -C empty.conf -i --repository=some_repo --repository=vanished_repo -L | tr -d '\n')"
atf_check_equal "$output" " 2 ${PWD}/some_repo (RSA unsigned) -1 vanished_repo (RSA maybe-signed)"
}
atf_init_test_cases() {
atf_add_test_case list_repos
}