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

Added support for shell (and csh as well) patterns for required

Browse Source 
dependencies, as specified in blueprint "improved-version-matching".

It's possible now to require greater, greater or equal than,
less, less or equal than, and equal pkg versions, as well as using
'{}' and '[^!]' csh patterns in dependencies.

Code lifted from FreeBSD, thanks! :-)

Change XBPS_RELVER to 20091107 to match latest additions.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091107035620-3051wcwrirqn2g14
This commit is contained in:
Juan RP
2009-11-07 04:56:20 +01:00
parent 95b51ae72b
commit adbd3d727c
11 changed files with 280 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-bin/check.c
View File

@@ -264,7 +264,7 @@ xbps_check_pkg_integrity(const char *pkgname)
}
while ((obj = prop_object_iterator_next(iter))) {
reqpkg = prop_string_cstring_nocopy(obj);
if (xbps_check_is_installed_pkg(reqpkg) < 0) {
if (xbps_check_is_installed_pkg(reqpkg) <= 0) {
rv = ENOENT;
printf("%s: dependency not satisfied: %s\n",
pkgname, reqpkg);

2
bin/xbps-bin/install.c
View File

@@ -64,7 +64,7 @@ show_missing_dep_cb(prop_object_t obj, void *arg, bool *loop_done)
prop_dictionary_get_cstring_nocopy(obj, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(obj, "version", &version);
if (pkgname && version) {
printf(" * Missing binary package for: %s >= %s\n",
printf(" * Missing binary package for: %s%s\n",
pkgname, version);
return 0;
}

8
bin/xbps-bin/show-deps.c
View File

@@ -44,12 +44,12 @@ list_deps(prop_object_t obj, void *arg, bool *loop_done)
assert(prop_object_type(obj) == PROP_TYPE_STRING);
pkgname = xbps_get_pkg_name(prop_string_cstring_nocopy(obj));
version = xbps_get_pkg_version(prop_string_cstring_nocopy(obj));
if (strcmp(version, "0") == 0)
pkgname = xbps_get_pkgdep_name(prop_string_cstring_nocopy(obj));
version = xbps_get_pkgdep_version(prop_string_cstring_nocopy(obj));
if (strcmp(version, ">=0") == 0)
printf("%s\n", pkgname);
else
printf("%s >= %s\n", pkgname, version);
printf("%s%s\n", pkgname, version);
free(pkgname);

27
bin/xbps-pkgdb/main.c
View File

@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <xbps_api.h>
@@ -58,13 +59,15 @@ usage(void)
printf("usage: xbps-pkgdb [options] [action] [args]\n"
"\n"
" Available actions:\n"
" getpkgname, getpkgrevision, getpkgversion, register\n"
" sanitize-plist, unregister, version\n"
" getpkgdepname, getpkgname, getpkgrevision, getpkgversion,\n"
" pkgmatch, register, sanitize-plist, unregister, version\n"
"\n"
" Action arguments:\n"
" getpkgdepname\t<string>\n"
" getpkgname\t\t<string>\n"
" getpkgrevision\t<string>\n"
" getpkgversion\t<string>\n"
" pkgmatch\t\t<pkg-version> <pkg-pattern>\n"
" register\t\t<pkgname> <version> <shortdesc>\n"
" sanitize-plist\t<plist>\n"
" unregister\t\t<pkgname> <version>\n"
@@ -248,6 +251,26 @@ main(int argc, char **argv)
printf("%s\n", version);
} else if (strcasecmp(argv[0], "getpkgdepname") == 0) {
/* Returns the pkgname of a dependency */
if (argc != 2)
usage();
pkgname = xbps_get_pkgdep_name(argv[1]);
if (pkgname == NULL)
exit(EXIT_FAILURE);
printf("%s\n", pkgname);
free(pkgname);
} else if (strcasecmp(argv[0], "pkgmatch") == 0) {
/* Matches a pkg with a pattern */
if (argc != 3)
usage();
rv = xbps_pkgdep_match(argv[1], argv[2]);
exit(rv);
} else {
usage();
}