libalpm/add.c: move assignment into conditional in alpm_add_pkg
While at it and for consistency move the assignment of the variable 'local' into the subsequent conditional. Signed-off-by: Michael Straube <michael.straube@posteo.de> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
3a5a0d53bc
commit
e1fc2f901e
1 changed files with 1 additions and 2 deletions
|
@ -80,8 +80,7 @@ int SYMEXPORT alpm_add_pkg(alpm_handle_t *handle, alpm_pkg_t *pkg)
|
||||||
RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1);
|
RET_ERR(handle, ALPM_ERR_TRANS_DUP_TARGET, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
local = _alpm_db_get_pkgfromcache(handle->db_local, pkgname);
|
if((local = _alpm_db_get_pkgfromcache(handle->db_local, pkgname))) {
|
||||||
if(local) {
|
|
||||||
const char *localpkgname = local->name;
|
const char *localpkgname = local->name;
|
||||||
const char *localpkgver = local->version;
|
const char *localpkgver = local->version;
|
||||||
int cmp = _alpm_pkg_compare_versions(pkg, local);
|
int cmp = _alpm_pkg_compare_versions(pkg, local);
|
||||||
|
|
Loading…
Add table
Reference in a new issue