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

rpool: no need to add repository object; it's already set by the repo code.

Browse Source
This commit is contained in:
Juan RP 2013-07-07 09:58:30 +02:00
parent ecd15b7d57
commit 7941b225fb
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/rpool_get.c
View File

@ -121,11 +121,9 @@ find_best_pkg_cb(struct xbps_repo *repo, void *arg, bool *done)
"pkgver", &repopkgver); "pkgver", &repopkgver);
if (rpf->bestpkgver == NULL) { if (rpf->bestpkgver == NULL) {
xbps_dbg_printf(repo->xhp, xbps_dbg_printf(repo->xhp,
"[rpool] Found best match '%s' (%s).\n", "[rpool] Found match '%s' (%s).\n",
repopkgver, repo->uri); repopkgver, repo->uri);
rpf->pkgd = pkgd; rpf->pkgd = pkgd;
xbps_dictionary_set_cstring_nocopy(rpf->pkgd,
"repository", repo->uri);
rpf->bestpkgver = repopkgver; rpf->bestpkgver = repopkgver;
return 0; return 0;
} }
@ -138,8 +136,6 @@ find_best_pkg_cb(struct xbps_repo *repo, void *arg, bool *done)
"[rpool] Found best match '%s' (%s).\n", "[rpool] Found best match '%s' (%s).\n",
repopkgver, repo->uri); repopkgver, repo->uri);
rpf->pkgd = pkgd; rpf->pkgd = pkgd;
xbps_dictionary_set_cstring_nocopy(rpf->pkgd,
"repository", repo->uri);
rpf->bestpkgver = repopkgver; rpf->bestpkgver = repopkgver;
} }
return 0; return 0;
@ -236,7 +232,6 @@ xbps_rpool_get_pkg_plist(struct xbps_handle *xhp,
const char *plistf) const char *plistf)
{ {
xbps_dictionary_t pkgd = NULL, plistd = NULL; xbps_dictionary_t pkgd = NULL, plistd = NULL;
const char *repo;
char *url; char *url;
assert(pkg != NULL); assert(pkg != NULL);
@ -260,10 +255,6 @@ xbps_rpool_get_pkg_plist(struct xbps_handle *xhp,
goto out; goto out;
} }
plistd = xbps_get_pkg_plist_from_binpkg(url, plistf); plistd = xbps_get_pkg_plist_from_binpkg(url, plistf);
if (plistd) {
xbps_dictionary_get_cstring_nocopy(pkgd, "repository", &repo);
xbps_dictionary_set_cstring_nocopy(plistd, "repository", repo);
}
free(url); free(url);
out: out: