On 06/03/2016 03:25 PM, Charles Arnold wrote:
> With Tumbleweed now part of libosinfo we do not need to default
> to openSUSE 13.2 when pointing at the installation media.
>
> Signed-off-by: Charles Arnold <carnold@xxxxxxxx>
>
> diff --git a/virtinst/urlfetcher.py b/virtinst/urlfetcher.py
> index e477ee0..692a297 100644
> --- a/virtinst/urlfetcher.py
> +++ b/virtinst/urlfetcher.py
> @@ -458,9 +458,6 @@ def _distroFromSUSEContent(fetcher, arch, vmtype=None):
> dclass = OpensuseDistro
> if distro_version is None:
> distro_version = ['VERSION', distribution[0].strip().rsplit(':')[4]]
> - # For tumbleweed we only have an 8 character date string so default to 13.2
> - if distro_version[1] and len(distro_version[1]) == 8:
> - distro_version = ['VERSION', '13.2']
>
> if distro_version is None:
> return None
> @@ -1019,7 +1016,11 @@ class SuseDistro(Distro):
> if sp_version:
> self.os_variant += sp_version
> else:
> - self.os_variant += distro_version
> + # Tumbleweed 8 digit date
> + if len(version) == 8:
> + self.os_variant += "tumbleweed"
> + else:
> + self.os_variant += distro_version
> else:
> self.os_variant += "9"
Thanks, I've pushed your two patches now
Is there a public URL for tumbleweed that I can add to test_urls.py?
Also, I'd like to eventually add unit tests for this 'content' parsing. Can
you send an email with some example sles 'content' files that this code knows
how to parse? Then itll be in the archives so someone in the future can more
easily add tests for this.
Thanks,
Cole
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
