[pacman-dev] [PATCHv2] Display old and new version in pacman -Qu output

[Allan McRae]

On 22/09/13 04:50, Florian Pritz wrote:
> This changes the output from "foo 1.0" to "foo 1.0 -> 1.1" which makes
> cronjobs that mail the -Qu output way more helpful.
> 
> Signed-off-by: Florian Pritz <bluewind at xinu.at>
> ---
> v2:
>  - add NULL check
>  - only display for -Qu, not for -Q
> 
>  src/pacman/query.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/src/pacman/query.c b/src/pacman/query.c
> index c9c82b9..3a0b4ea 100644
> --- a/src/pacman/query.c
> +++ b/src/pacman/query.c
> @@ -318,8 +318,16 @@ static int display(alpm_pkg_t *pkg)
>  			&& !config->op_q_changelog && !config->op_q_check) {
>  		if(!config->quiet) {
>  			const colstr_t *colstr = &config->colstr;
> -			printf("%s%s %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg),
> +			alpm_pkg_t *newpkg = alpm_sync_newversion(pkg, alpm_get_syncdbs(config->handle));

This does not need found unless we are doing -Qu so move it...

> +
> +			printf("%s%s %s%s%s", colstr->title, alpm_pkg_get_name(pkg),
>  					colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor);
> +
> +			if(config->op_q_upgrade && newpkg) {

Here.

I say we can kill the null check given we know this package has an
update available and we do not do those checks in the (e.g.)
alpm_pkg_get_version above.

> +				printf(" -> %s%s%s", colstr->version, alpm_pkg_get_version(newpkg), colstr->nocolor);
> +			}
> +
> +			printf("\n");
>  		} else {
>  			printf("%s\n", alpm_pkg_get_name(pkg));
>  		}
>