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

Misc cleanups and performance improvements.

Browse Source 
- There's no need to check rval for prop_dictionary_get_*, we are sure the
  objects are there at prop_dictionary_set_* time.
- Avoid two chdir(2) calls per INSTALL/REMOVE run.
- Avoid using access(2) to check for existence of INSTALL/REMOVE scripts,
  just try to run the executable directly and check for ENOENT.
This commit is contained in:
Juan RP
2010-11-06 06:44:00 +01:00
parent f8629652da
commit ec7cdde1e0
22 changed files with 228 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/repository_finddeps.c
View File

@ -46,13 +46,8 @@ store_dependency(prop_dictionary_t trans_dict, prop_dictionary_t repo_pkg_dict,
/*
* Get some info about dependencies and current repository.
*/
if (!prop_dictionary_get_cstring_nocopy(repo_pkg_dict,
"pkgname", &pkgname))
return errno;
if (!prop_dictionary_get_cstring_nocopy(repo_pkg_dict,
"pkgver", &pkgver))
return errno;
prop_dictionary_get_cstring_nocopy(repo_pkg_dict, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(repo_pkg_dict, "pkgver", &pkgver);
dict = prop_dictionary_copy(repo_pkg_dict);
if (dict == NULL)
@ -318,13 +313,8 @@ find_repo_deps(prop_dictionary_t trans_dict, prop_dictionary_t repo_dict,
break;
}
} else if (curpkgd) {
if (!prop_dictionary_get_cstring_nocopy(curpkgd,
"pkgver", &pkg_queued)) {
DPRINTF(("pkgver failed %s\n", reqpkg));
free(pkgname);
rv = errno;
break;
}
prop_dictionary_get_cstring_nocopy(curpkgd,
"pkgver", &pkg_queued);
if (xbps_pkgpattern_match(pkg_queued,
__UNCONST(reqpkg))) {
if (flags & XBPS_FLAG_VERBOSE)
@ -370,12 +360,7 @@ find_repo_deps(prop_dictionary_t trans_dict, prop_dictionary_t repo_dict,
* If version in repo does not satisfy the rundep, pass
* to the next rundep.
*/
if (!prop_dictionary_get_cstring_nocopy(curpkgd,
"pkgver", &repo_pkgver)) {
free(pkgname);
rv = errno;
break;
}
prop_dictionary_get_cstring_nocopy(curpkgd, "pkgver", &repo_pkgver);
if (xbps_pkgpattern_match(repo_pkgver, __UNCONST(reqpkg)) < 1) {
free(pkgname);
continue;
@ -483,13 +468,8 @@ xbps_repository_find_pkg_deps(prop_dictionary_t trans_dict,
if (pkg_rdeps == NULL)
return 0;
if (!prop_dictionary_get_cstring_nocopy(repo_pkg_dict,
"pkgname", &pkgname))
return errno;
if (!prop_dictionary_get_cstring_nocopy(repo_pkg_dict,
"pkgver", &pkgver))
return errno;
prop_dictionary_get_cstring_nocopy(repo_pkg_dict, "pkgname", &pkgname);
prop_dictionary_get_cstring_nocopy(repo_pkg_dict, "pkgver", &pkgver);
if ((rv = xbps_repository_pool_init()) != 0)
return rv;