[pacman-dev] [PATCHv2] pacman -Si/-Qi: Autodetect best fitting file size unit

[Allan McRae]

On 19/10/13 01:09, Florian Pritz wrote:
> I've tracked this back to e223366 and it looks like this just forces KiB
> because back then humanize_size didn't exist, but the size was just
> divided by 1024 to keep it somewhat readable. When humanize_size got
> introduced in 3c8a448 this was just carried over.
> 
> The unit detected for "Download Size" is reused for "Installed Size" to
> make it easier to read.
> 
> Signed-off-by: Florian Pritz <bluewind at xinu.at>
> ---
> 

Test suite failure:

FAIL: test/pacman/tests/query006
================================

1..1
# Running 'query006'
# ==> Generating test environment
# ==> Running test
# ==> Checking rules
    1..6
    ok 1 - PACMAN_RETCODE=0
    ok 2 - PACMAN_OUTPUT=^Name.*overflow
    ok 3 - PACMAN_OUTPUT=^Description.*Overflow size and date values if
possible
    not ok 4 - PACMAN_OUTPUT=^Installed Size.*9765625.00 KiB
    ok 5 - PACMAN_OUTPUT=^Build Date.* 2065
    ok 6 - PACMAN_OUTPUT=^Install Date.* 2286
not ok 1 - Query info on a package (overflow long values)
FAIL: test/pacman/tests/query006.py 1 - Query info on a package
(overflow long values)



> v2: use same unit for both sizes
> 
>  src/pacman/package.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/pacman/package.c b/src/pacman/package.c
> index eab2873..decb435 100644
> --- a/src/pacman/package.c
> +++ b/src/pacman/package.c
> @@ -165,7 +165,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
>  	deplist_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg), cols);
>  	deplist_display(_("Replaces       :"), alpm_pkg_get_replaces(pkg), cols);
>  
> -	size = humanize_size(alpm_pkg_get_size(pkg), 'K', 2, &label);
> +	size = humanize_size(alpm_pkg_get_size(pkg), '\0', 2, &label);
>  	if(from == ALPM_PKG_FROM_SYNCDB) {
>  		printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Download Size  :"),
>  			config->colstr.nocolor, size, label);
> @@ -174,7 +174,7 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra)
>  			config->colstr.nocolor, size, label);
>  	}
>  
> -	size = humanize_size(alpm_pkg_get_isize(pkg), 'K', 2, &label);
> +	size = humanize_size(alpm_pkg_get_isize(pkg), label[0], 2, &label);
>  	printf("%s%s%s %6.2f %s\n", config->colstr.title, _("Installed Size :"),
>  			config->colstr.nocolor, size, label);
>  
>