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

lib/transaction_ops.c: only call xbps_pkg_name() when it's really necessary.

Browse Source
This commit is contained in:
Juan RP 2013-03-07 09:12:47 +01:00
parent 5409e51822
commit 37263d63c9
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/transaction_ops.c
View File

@ -62,7 +62,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
{ {
prop_dictionary_t pkg_pkgdb = NULL, pkg_repod; prop_dictionary_t pkg_pkgdb = NULL, pkg_repod;
prop_array_t unsorted; prop_array_t unsorted;
const char *repoloc, *repover, *repopkgver, *instpkgver, *reason; const char *repoloc, *repopkgver, *instpkgver, *reason;
char *pkgname; char *pkgname;
int rv = 0; int rv = 0;
pkg_state_t state = 0; pkg_state_t state = 0;
@ -92,11 +92,6 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver); prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver);
prop_dictionary_get_cstring_nocopy(pkg_repod, "repository", &repoloc); prop_dictionary_get_cstring_nocopy(pkg_repod, "repository", &repoloc);
pkgname = xbps_pkg_name(repopkgver);
assert(pkgname);
repover = xbps_pkg_version(repopkgver);
assert(repover);
if (action == TRANS_UPDATE) { if (action == TRANS_UPDATE) {
/* /*
* Compare installed version vs best pkg available in repos. * Compare installed version vs best pkg available in repos.
@ -107,17 +102,14 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
xbps_dbg_printf(xhp, "[rpool] Skipping `%s' " xbps_dbg_printf(xhp, "[rpool] Skipping `%s' "
"(installed: %s) from repository `%s'\n", "(installed: %s) from repository `%s'\n",
repopkgver, instpkgver, repoloc); repopkgver, instpkgver, repoloc);
free(pkgname);
return EEXIST; return EEXIST;
} }
} }
/* /*
* Prepare transaction dictionary. * Prepare transaction dictionary.
*/ */
if ((rv = xbps_transaction_init(xhp)) != 0) { if ((rv = xbps_transaction_init(xhp)) != 0)
free(pkgname);
return rv; return rv;
}
unsorted = prop_dictionary_get(xhp->transd, "unsorted_deps"); unsorted = prop_dictionary_get(xhp->transd, "unsorted_deps");
/* /*
@ -133,15 +125,15 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
if (xbps_find_pkg_in_array(unsorted, repopkgver)) { if (xbps_find_pkg_in_array(unsorted, repopkgver)) {
xbps_dbg_printf(xhp, "[update] `%s' already queued in " xbps_dbg_printf(xhp, "[update] `%s' already queued in "
"transaction.\n", repopkgver); "transaction.\n", repopkgver);
free(pkgname);
return EEXIST; return EEXIST;
} }
} }
if ((rv = xbps_repository_find_deps(xhp, unsorted, pkg_repod)) != 0) { if ((rv = xbps_repository_find_deps(xhp, unsorted, pkg_repod)) != 0)
free(pkgname);
return rv; return rv;
}
pkgname = xbps_pkg_name(repopkgver);
assert(pkgname);
/* /*
* Set package state in dictionary with same state than the * Set package state in dictionary with same state than the
* package currently uses, otherwise not-installed. * package currently uses, otherwise not-installed.
@ -156,10 +148,8 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, int action)
} }
free(pkgname); free(pkgname);
if ((rv = xbps_set_pkg_state_dictionary(pkg_repod, state)) != 0) { if ((rv = xbps_set_pkg_state_dictionary(pkg_repod, state)) != 0)
free(pkgname);
return rv; return rv;
}
if ((action == TRANS_INSTALL) && (state == XBPS_PKG_STATE_UNPACKED)) if ((action == TRANS_INSTALL) && (state == XBPS_PKG_STATE_UNPACKED))
reason = "configure"; reason = "configure";