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

xbps-bin(8): implemented Launchpad blueprint "arbitrary-pkgname-args".

Browse Source 
See https://blueprints.launchpad.net/xbps/+spec/arbitrary-pkgname-args.

The install, update and remove targets now accept a list of package
names that will be processed.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091222113736-0dawl4whvtdi5dj3
This commit is contained in:
Juan RP
2009-12-22 12:37:36 +01:00
parent 009c2131fc
commit 7eea0f8e8e
7 changed files with 195 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/repository_finddeps.c
View File

@@ -90,7 +90,10 @@ store_dependency(prop_dictionary_t master, prop_dictionary_t depd,
prop_object_release(dict);
return errno;
}
if (!prop_dictionary_set_bool(dict, "automatic-install", true)) {
prop_object_release(dict);
return errno;
}
/*
* Add the dictionary into the array.
*/

49
lib/repository_findpkg.c
View File

@@ -301,7 +301,7 @@ int SYMEXPORT
xbps_repository_install_pkg(const char *pkgname)
{
prop_dictionary_t origin_pkgrd = NULL, pkgrd = NULL;
prop_array_t pkgs_array;
prop_array_t unsorted;
struct repository_pool *rpool;
int rv = 0;
@@ -345,49 +345,18 @@ xbps_repository_install_pkg(const char *pkgname)
}
origin_pkgrd = prop_dictionary_copy(pkgrd);
if (!prop_dictionary_set_cstring(trans_dict, "origin", pkgname)) {
rv = errno;
goto out;
}
/*
* Check if this package needs dependencies.
* Prepare required package dependencies.
*/
if (xbps_pkg_has_rundeps(pkgrd)) {
/*
* Construct the dependency chain for this package.
*/
if ((rv = xbps_repository_find_pkg_deps(trans_dict,
pkgrd)) != 0)
goto out;
/*
* Sort the dependency chain for this package.
*/
if ((rv = xbps_sort_pkg_deps(trans_dict)) != 0)
goto out;
} else {
/*
* Package has no deps, so we have to create the
* "packages" array.
*/
pkgs_array = prop_array_create();
if (pkgs_array == NULL) {
rv = errno;
goto out;
}
if (!prop_dictionary_set(trans_dict, "packages",
pkgs_array)) {
rv = errno;
goto out;
}
}
if ((rv = xbps_repository_find_pkg_deps(trans_dict, pkgrd)) != 0)
goto out;
/*
* Add required package dictionary into the packages
* dictionary.
* Add required package dictionary into the unsorted deps dictionary,
* set package state as not yet installed.
*/
pkgs_array = prop_dictionary_get(trans_dict, "packages");
if (pkgs_array == NULL ||
prop_object_type(pkgs_array) != PROP_TYPE_ARRAY) {
unsorted = prop_dictionary_get(trans_dict, "unsorted_deps");
if (unsorted == NULL) {
rv = EINVAL;
goto out;
}
@@ -399,7 +368,7 @@ xbps_repository_install_pkg(const char *pkgname)
rv = errno;
goto out;
}
if (!prop_array_add(pkgs_array, origin_pkgrd))
if (!prop_array_add(unsorted, origin_pkgrd))
rv = errno;
out: