mirror of
https://github.com/moparisthebest/pacman
synced 2025-01-08 12:28:00 -05:00
checkdeps: remove unnecessary list join and copy
We can just perform the same search operation on both lists. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
925d74f38d
commit
f612e5ede7
@ -269,22 +269,20 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_handle_t *handle, alpm_list_t *pkglis
|
|||||||
alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps)
|
alpm_list_t *remove, alpm_list_t *upgrade, int reversedeps)
|
||||||
{
|
{
|
||||||
alpm_list_t *i, *j;
|
alpm_list_t *i, *j;
|
||||||
alpm_list_t *targets, *dblist = NULL, *modified = NULL;
|
alpm_list_t *dblist = NULL, *modified = NULL;
|
||||||
alpm_list_t *baddeps = NULL;
|
alpm_list_t *baddeps = NULL;
|
||||||
int nodepversion;
|
int nodepversion;
|
||||||
|
|
||||||
CHECK_HANDLE(handle, return NULL);
|
CHECK_HANDLE(handle, return NULL);
|
||||||
|
|
||||||
targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
|
|
||||||
for(i = pkglist; i; i = i->next) {
|
for(i = pkglist; i; i = i->next) {
|
||||||
alpm_pkg_t *pkg = i->data;
|
alpm_pkg_t *pkg = i->data;
|
||||||
if(_alpm_pkg_find(targets, pkg->name)) {
|
if(_alpm_pkg_find(remove, pkg->name) || _alpm_pkg_find(upgrade, pkg->name)) {
|
||||||
modified = alpm_list_add(modified, pkg);
|
modified = alpm_list_add(modified, pkg);
|
||||||
} else {
|
} else {
|
||||||
dblist = alpm_list_add(dblist, pkg);
|
dblist = alpm_list_add(dblist, pkg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
alpm_list_free(targets);
|
|
||||||
|
|
||||||
nodepversion = no_dep_version(handle);
|
nodepversion = no_dep_version(handle);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user