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

xbps-query: explicitly use -R for repository mode; otherwise local.

Browse Source 
This closes #3 by radare.
This commit is contained in:
Juan RP 2013-02-02 12:02:10 +01:00
parent 5c1688944d
commit dcff876533
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NEWS
View File

@ -1,5 +1,12 @@
xbps-0.21 (???): xbps-0.21 (???):
* xbps-query(8): fix issue #3 from github
"xbps-query -o only works for installed packages".
The behaviour has been changed for all modes and to explicitly get
info from repositories the -R flag must be used; otherwise it will
use local packages.
* xbps-install(8): the -f, --force flag will now preserve configuration * xbps-install(8): the -f, --force flag will now preserve configuration
files if they were modified, and only unpack files that have been files if they were modified, and only unpack files that have been
modified when re-installing packages. If -f is specified twice (-ff) modified when re-installing packages. If -f is specified twice (-ff)

23
bin/xbps-query/main.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2012 Juan Romero Pardines. * Copyright (c) 2008-2013 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -221,43 +221,30 @@ main(int argc, char **argv)
/* show mode */ /* show mode */
if (repo_mode) if (repo_mode)
rv = repo_show_pkg_info(&xh, argv[optind], props); rv = repo_show_pkg_info(&xh, argv[optind], props);
else { else
rv = show_pkg_info_from_metadir(&xh, rv = show_pkg_info_from_metadir(&xh,
argv[optind], props); argv[optind], props);
if (rv == ENOENT)
rv = repo_show_pkg_info(&xh,
argv[optind], props);
}
} else if (show_files) { } else if (show_files) {
/* show-files mode */ /* show-files mode */
if (repo_mode) if (repo_mode)
rv = repo_show_pkg_files(&xh, argv[optind]); rv = repo_show_pkg_files(&xh, argv[optind]);
else { else
rv = show_pkg_files_from_metadir(&xh, argv[optind]); rv = show_pkg_files_from_metadir(&xh, argv[optind]);
if (rv == ENOENT)
rv = repo_show_pkg_files(&xh, argv[optind]);
}
} else if (show_deps) { } else if (show_deps) {
/* show-deps mode */ /* show-deps mode */
if (repo_mode) if (repo_mode)
rv = repo_show_pkg_deps(&xh, argv[optind]); rv = repo_show_pkg_deps(&xh, argv[optind]);
else { else
rv = show_pkg_deps(&xh, argv[optind]); rv = show_pkg_deps(&xh, argv[optind]);
if (rv == ENOENT)
rv = repo_show_pkg_deps(&xh, argv[optind]);
}
} else if (show_rdeps) { } else if (show_rdeps) {
/* show-rdeps mode */ /* show-rdeps mode */
if (repo_mode) if (repo_mode)
rv = repo_show_pkg_revdeps(&xh, argv[optind]); rv = repo_show_pkg_revdeps(&xh, argv[optind]);
else { else
rv = show_pkg_revdeps(&xh, argv[optind]); rv = show_pkg_revdeps(&xh, argv[optind]);
if (rv == ENOENT)
rv = repo_show_pkg_revdeps(&xh, argv[optind]);
}
} }
exit(rv); exit(rv);

4
bin/xbps-query/xbps-query.8
View File

@ -1,4 +1,4 @@
.Dd December 20, 2012 .Dd February 2, 2013
.Os Void Linux .Os Void Linux
.Dt xbps-query 8 .Dt xbps-query 8
.Sh NAME .Sh NAME
@ -75,7 +75,7 @@ By default and unless the
.Fl R .Fl R
option is specified, the target option is specified, the target
.Ar PKG .Ar PKG
will be queried in the root directory, and if this fails, it will be will be queried in the root directory, otherwise it will be
queried in registered repositories. queried in registered repositories.
.Bl -tag -width -x .Bl -tag -width -x
.It Fl l, Fl -list-pkgs .It Fl l, Fl -list-pkgs