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

libxbps: modify the API, new func xbps_get_binpkg_repo_uri().

Browse Source 
This function replaces xbps_repository_get_path_from_pkg_dict() and
xbps_get_binpkg_local_path(). It takes a pkg dictionary as returned
by a repository pkg index or a transaction dictionary and returns
a string with the full path to the binary pkg, either in local
repos, cachedir or remote repos.

Update all code to use this function... sorry I broke ABI compatiblity.
This commit is contained in:
Juan RP
2011-01-18 18:21:55 +01:00
parent 6d7121c5bd
commit fe15380e1b
7 changed files with 79 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lib/util.c
View File

@ -374,22 +374,35 @@ xbps_get_pkg_index_plist(const char *uri)
}
char *
xbps_get_binpkg_local_path(prop_dictionary_t pkgd, const char *repoloc)
xbps_get_binpkg_repo_uri(prop_dictionary_t pkg_repod)
{
const char *filen, *arch, *cdir;
const char *filen, *arch, *cdir, *repoloc;
char *lbinpkg = NULL;
prop_dictionary_get_cstring_nocopy(pkg_repod, "filename", &filen);
prop_dictionary_get_cstring_nocopy(pkg_repod, "architecture", &arch);
prop_dictionary_get_cstring_nocopy(pkg_repod, "repository", &repoloc);
prop_dictionary_get_cstring_nocopy(pkgd, "filename", &filen);
prop_dictionary_get_cstring_nocopy(pkgd, "architecture", &arch);
cdir = xbps_get_cachedir();
if (cdir == NULL)
return NULL;
if (!xbps_check_is_repo_string_remote(repoloc)) {
/* local repo */
return xbps_xasprintf("%s/%s/%s", repoloc, arch, filen);
}
/* cachedir */
return xbps_xasprintf("%s/%s", cdir, filen);
/*
* First check if binpkg is available in cachedir.
*/
lbinpkg = xbps_xasprintf("%s/%s", cdir, filen);
if (lbinpkg == NULL)
return NULL;
if (access(lbinpkg, R_OK) == 0)
return lbinpkg;
free(lbinpkg);
/*
* Local and remote repositories use the same path.
*/
return xbps_xasprintf("%s/%s/%s", repoloc, arch, filen);
}
bool