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

xbps.d(5): 'virtualpkg' can now be used to map any pkg to another.

Browse Source 
See NEWS for more information.
This commit is contained in:
Juan RP 2016-03-23 12:46:52 +01:00
parent 897ac238c4
commit 29765271e9
4 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -1,8 +1,16 @@
xbps-0.52 (???): xbps-0.52 (???):
* xbps.d(5): the 'virtualpkg' keyword can now be used to map any pkg
to another, even if there's an existing real package. Example:
virtualpkg=wifi-firmware:base-system
Any request to the `wifi-firmware` pkg will be resolved to the
`base-system` pkg.
* libxbps: fixed some missing or incorrect printf format arguments * libxbps: fixed some missing or incorrect printf format arguments
found by using __attribute__((format,printf). Patch provided by found by using __attribute__((format,printf). Patch provided by
Michael Ghering in #148. See https://github.com/voidlinux/xbps/issues/148 Michael Gehring in #148. See https://github.com/voidlinux/xbps/issues/148
* libxbps: ignore updates for packages that have held dependencies. * libxbps: ignore updates for packages that have held dependencies.
Fixes #143. See https://github.com/voidlinux/xbps/issues/143 Fixes #143. See https://github.com/voidlinux/xbps/issues/143

2
include/xbps_api_impl.h
View File

@ -117,6 +117,8 @@ int HIDDEN xbps_entry_install_conf_file(struct xbps_handle *, xbps_dictionary_t,
const char *); const char *);
int HIDDEN xbps_repository_find_deps(struct xbps_handle *, xbps_array_t, int HIDDEN xbps_repository_find_deps(struct xbps_handle *, xbps_array_t,
xbps_dictionary_t); xbps_dictionary_t);
xbps_dictionary_t HIDDEN xbps_find_virtualpkg_in_conf(struct xbps_handle *,
xbps_dictionary_t, const char *);
xbps_dictionary_t HIDDEN xbps_find_pkg_in_dict(xbps_dictionary_t, const char *); xbps_dictionary_t HIDDEN xbps_find_pkg_in_dict(xbps_dictionary_t, const char *);
xbps_dictionary_t HIDDEN xbps_find_virtualpkg_in_dict(struct xbps_handle *, xbps_dictionary_t HIDDEN xbps_find_virtualpkg_in_dict(struct xbps_handle *,
xbps_dictionary_t, const char *); xbps_dictionary_t, const char *);

28
lib/plist_find.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008-2014 Juan Romero Pardines. * Copyright (c) 2008-2016 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
@ -263,14 +263,12 @@ vpkg_user_conf(struct xbps_handle *xhp, const char *vpkg)
return found ? pkg : NULL; return found ? pkg : NULL;
} }
xbps_dictionary_t xbps_dictionary_t HIDDEN
xbps_find_virtualpkg_in_dict(struct xbps_handle *xhp, xbps_find_virtualpkg_in_conf(struct xbps_handle *xhp,
xbps_dictionary_t d, xbps_dictionary_t d,
const char *pkg) const char *pkg)
{ {
xbps_object_t obj; xbps_dictionary_t pkgd;
xbps_object_iterator_t iter;
xbps_dictionary_t pkgd = NULL;
const char *vpkg; const char *vpkg;
/* Try matching vpkg from configuration files */ /* Try matching vpkg from configuration files */
@ -287,6 +285,22 @@ xbps_find_virtualpkg_in_dict(struct xbps_handle *xhp,
return pkgd; return pkgd;
} }
return NULL;
}
xbps_dictionary_t HIDDEN
xbps_find_virtualpkg_in_dict(struct xbps_handle *xhp,
xbps_dictionary_t d,
const char *pkg)
{
xbps_object_t obj;
xbps_object_iterator_t iter;
xbps_dictionary_t pkgd = NULL;
/* Try matching vpkg from configuration files */
if ((pkgd = xbps_find_virtualpkg_in_conf(xhp, d, pkg)))
return pkgd;
/* ... otherwise match the first one in dictionary */ /* ... otherwise match the first one in dictionary */
iter = xbps_dictionary_iterator(d); iter = xbps_dictionary_iterator(d);
assert(iter); assert(iter);
@ -303,7 +317,7 @@ xbps_find_virtualpkg_in_dict(struct xbps_handle *xhp,
return NULL; return NULL;
} }
xbps_dictionary_t xbps_dictionary_t HIDDEN
xbps_find_pkg_in_dict(xbps_dictionary_t d, const char *pkg) xbps_find_pkg_in_dict(xbps_dictionary_t d, const char *pkg)
{ {
xbps_dictionary_t pkgd = NULL; xbps_dictionary_t pkgd = NULL;

5
lib/repo.c
View File

@ -340,6 +340,11 @@ xbps_repo_get_pkg(struct xbps_repo *repo, const char *pkg)
if (repo->idx == NULL) if (repo->idx == NULL)
return NULL; return NULL;
/* Try matching vpkg from configuration files */
if ((pkgd = xbps_find_virtualpkg_in_conf(repo->xhp, repo->idx, pkg)))
return pkgd;
/* ... otherwise match a real pkg */
pkgd = xbps_find_pkg_in_dict(repo->idx, pkg); pkgd = xbps_find_pkg_in_dict(repo->idx, pkg);
if (pkgd) { if (pkgd) {
xbps_dictionary_set_cstring_nocopy(pkgd, xbps_dictionary_set_cstring_nocopy(pkgd,