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

Fix reinstallation of pkgs in repolock mode.

Browse Source 
At the time we've been searching for the pkg in a repo, no repos
were registered resulting in EINVAL. While here, if there's no
declared repos return ENOENT instead.
This commit is contained in:
Juan RP
2015-03-05 21:23:58 +01:00
parent 3da2c3fdda
commit 441f147f05
4 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/rpool.c
View File

@@ -79,6 +79,34 @@ xbps_rpool_sync(struct xbps_handle *xhp, const char *uri)
return 0;
}
struct xbps_repo HIDDEN *
xbps_regget_repo(struct xbps_handle *xhp, const char *url)
{
struct xbps_repo *repo;
const char *repouri;
if (SIMPLEQ_EMPTY(&rpool_queue)) {
/* iterate until we have a match */
for (unsigned int i = 0; i < xbps_array_count(xhp->repositories); i++) {
xbps_array_get_cstring_nocopy(xhp->repositories, i, &repouri);
if (strcmp(repouri, url))
continue;
repo = xbps_repo_open(xhp, repouri, false);
if (!repo)
return NULL;
SIMPLEQ_INSERT_TAIL(&rpool_queue, repo, entries);
xbps_dbg_printf(xhp, "[rpool] `%s' registered.\n", repouri);
}
}
SIMPLEQ_FOREACH(repo, &rpool_queue, entries)
if (strcmp(url, repo->uri) == 0)
return repo;
return NULL;
}
struct xbps_repo *
xbps_rpool_get_repo(const char *url)
{

6
lib/transaction_ops.c
View File

@@ -108,8 +108,10 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall,
/* find update from repo */
xbps_dictionary_get_cstring_nocopy(pkg_pkgdb, "repository", &repoloc);
assert(repoloc);
if ((repo = xbps_rpool_get_repo(repoloc)) == NULL)
return EINVAL;
if ((repo = xbps_regget_repo(xhp, repoloc)) == NULL) {
/* not found */
return ENOENT;
}
pkg_repod = xbps_repo_get_pkg(repo, pkg);
} else {
/* find update from rpool */