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

xbps-bin: the install target gains suppor for installing best pkg available.

Browse Source
This commit is contained in:
Juan RP
2012-01-25 02:14:04 +01:00
parent 11f94a4f46
commit abb0d260b9
5 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/repository_finddeps.c
View File

@@ -214,7 +214,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
xbps_dbg_printf("");
for (x = 0; x < *depth; x++)
xbps_dbg_printf_append(" ");
xbps_dbg_printf_append("%s requires dependency '%s': ",
xbps_dbg_printf_append("%s: requires dependency '%s': ",
curpkg ? curpkg : " ", reqpkg);
}
/*
@@ -258,7 +258,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
break;
}
/* Required pkgdep not installed */
xbps_dbg_printf_append("not installed");
xbps_dbg_printf_append("not installed. ");
reason = "install";
state = XBPS_PKG_STATE_NOT_INSTALLED;
} else {
@@ -403,8 +403,8 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
if (tmpd == NULL) {
/* dependency not installed */
reason = "install";
xbps_dbg_printf_append("satisfied by `%s', "
"installing...\n", pkgver_q);
xbps_dbg_printf_append("(found `%s')\n",
pkgver_q);
} else {
/* dependency installed, check its state */
state = 0;
@@ -416,12 +416,12 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
}
if (state == XBPS_PKG_STATE_INSTALLED) {
reason = "update";
xbps_dbg_printf_append("satisfied by `%s', "
"updating...\n", pkgver_q);
xbps_dbg_printf_append("(found `%s')\n",
pkgver_q);
} else if (state == XBPS_PKG_STATE_UNPACKED) {
reason = "install";
xbps_dbg_printf_append("satisfied by `%s', "
"installing...\n", pkgver_q);
xbps_dbg_printf_append("(found `%s')\n",
pkgver_q);
}
prop_object_release(tmpd);
}

49
lib/transaction_ops.c
View File

@@ -57,43 +57,37 @@ enum {
};
static int
transaction_find_pkg(const char *pattern, int action)
transaction_find_pkg(const char *pkg, bool bypattern, bool bestpkg, int action)
{
prop_dictionary_t pkg_pkgdb, pkg_repod = NULL;
prop_array_t unsorted;
struct xbps_handle *xhp = xbps_handle_get();
const char *pkgname, *pkgver, *repoloc, *repover, *instver, *reason;
int rv = 0;
bool bypattern, bestpkg;
pkg_state_t state = 0;
assert(pattern != NULL);
assert(pkg != NULL);
if (action == TRANS_INSTALL) {
/* install */
bypattern = true;
bestpkg = false;
reason = "install";
} else {
/* update */
pkg_pkgdb = xbps_find_pkg_dict_installed(pattern, false);
pkg_pkgdb = xbps_find_pkg_dict_installed(pkg, false);
if (pkg_pkgdb == NULL) {
rv = ENODEV;
goto out;
}
bypattern = false;
bestpkg = true;
reason = "update";
}
/*
* Find out if the pkg has been found in repository pool.
*/
pkg_repod = xbps_repository_pool_find_pkg(pattern,
bypattern, bestpkg);
pkg_repod = xbps_repository_pool_find_pkg(pkg, bypattern, bestpkg);
if (pkg_repod == NULL) {
pkg_repod =
xbps_repository_pool_find_virtualpkg(pattern, bypattern);
xbps_repository_pool_find_virtualpkg(pkg, bypattern);
if (pkg_repod == NULL) {
/* not found */
rv = errno;
@@ -105,7 +99,7 @@ transaction_find_pkg(const char *pattern, int action)
prop_dictionary_get_cstring_nocopy(pkg_repod, "repository", &repoloc);
prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgname", &pkgname);
if (bestpkg) {
if (bestpkg && (action == TRANS_UPDATE)) {
/*
* Compare installed version vs best pkg available in repos.
*/
@@ -231,13 +225,38 @@ xbps_transaction_update_packages(void)
int
xbps_transaction_update_pkg(const char *pkgname)
{
return transaction_find_pkg(pkgname, TRANS_UPDATE);
return transaction_find_pkg(pkgname, false, true, TRANS_UPDATE);
}
int
xbps_transaction_install_pkg(const char *pkgpattern)
xbps_transaction_install_pkg(const char *pkg, bool reinstall)
{
return transaction_find_pkg(pkgpattern, TRANS_INSTALL);
prop_dictionary_t pkgd;
pkg_state_t state;
bool bypattern, bestpkg;
if (xbps_pkgpattern_version(pkg)) {
bypattern = true;
bestpkg = false;
} else {
bypattern = false;
bestpkg = true;
}
pkgd = xbps_pkgdb_get_pkgd(pkg, bypattern);
if (pkgd != NULL) {
if (xbps_pkg_state_dictionary(pkgd, &state) != 0) {
prop_object_release(pkgd);
return EINVAL;
}
prop_object_release(pkgd);
if ((state == XBPS_PKG_STATE_INSTALLED) && !reinstall) {
/* error out if pkg installed and no reinstall */
return ENODEV;
}
}
return transaction_find_pkg(pkg, bypattern, bestpkg, TRANS_INSTALL);
}
int