Libguestfs - Feb 2018 - [PATCH 1.38.x] builder-repository: fix compute_short_id for sles X.0

It needs to check for the minor version, not major version.

Fixes commit a442d2c3217f709128f0e377f88649fb6ba90f45.
---
 builder/repository_main.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builder/repository_main.ml b/builder/repository_main.ml
index bb440563b..9932fbae4 100644
--- a/builder/repository_main.ml
+++ b/builder/repository_main.ml
@@ -178,7 +178,7 @@ let compute_short_id distro major minor      sprintf
"%s%d" distro major
   | ("fedora"|"mageia") ->
     sprintf "%s%d" distro major
-  | "sles" when major = 0 ->
+  | "sles" when minor = 0 ->
     sprintf "%s%d" distro major
   | "sles" ->
     sprintf "%s%dsp%d" distro major minor
-- 
2.14.3

On Thu, Feb 22, 2018 at 06:41:51PM +0100, Pino Toscano
wrote:
> It needs to check for the minor version, not major version.
> 
> Fixes commit a442d2c3217f709128f0e377f88649fb6ba90f45.
> ---
>  builder/repository_main.ml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/builder/repository_main.ml b/builder/repository_main.ml
> index bb440563b..9932fbae4 100644
> --- a/builder/repository_main.ml
> +++ b/builder/repository_main.ml
> @@ -178,7 +178,7 @@ let compute_short_id distro major minor >     
sprintf "%s%d" distro major
>    | ("fedora"|"mageia") ->
>      sprintf "%s%d" distro major
> -  | "sles" when major = 0 ->
> +  | "sles" when minor = 0 ->
>      sprintf "%s%d" distro major
>    | "sles" ->
>      sprintf "%s%dsp%d" distro major minor
> -- 
> 2.14.3
> 
ACK

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines.  Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v