[pacman-dev] [PATCH 7/7] find_fileconflicts: reduce path resolution calls

[Allan McRae]

On 14/02/13 09:54, Andrew Gregory wrote:
> Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
> ---
>  lib/libalpm/conflict.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
> index 610e5ad..96f2109 100644
> --- a/lib/libalpm/conflict.c
> +++ b/lib/libalpm/conflict.c
> @@ -414,6 +414,11 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
>  
>  	rootlen = strlen(handle->root);
>  
> +	/* make sure all files to be installed have been resolved */
> +	for(i = upgrade; i; i = i->next) {
> +		_alpm_filelist_resolve(handle, alpm_pkg_get_files(i->data));
> +	}
> +

Ack.  I did not do this originally as I thought there would be a pause
before the conflict checking progress bar started.  Installing all of
"base" and "base-devel" showed no noticeable pause...