Currently osinfo-db has "unknown" entries for fedora, opensuse and
asianux. Considering this list may grow even more at some point, let's
just make the check more generic and use it for all of them instead of
keeping it for fedora only.
Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
---
virtinst/osdict.py | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/virtinst/osdict.py b/virtinst/osdict.py
index 28e076da..92fe9522 100644
--- a/virtinst/osdict.py
+++ b/virtinst/osdict.py
@@ -208,11 +208,15 @@ class _OSDB(object):
return None
osname = ret[0].get_short_id()
- if osname == "fedora-unknown":
- osname = self.latest_fedora_version()
- logging.debug("Detected location=%s as os=fedora-unknown. "
- "Converting that to the latest fedora OS version=%s",
- location, osname)
+ if osname.endswith("-unknown"):
+ # We want to get whatever the name is apart from unknown, instead
+ # of getting the distro, as some enterprise distros may have more
+ # than one "unknown" entry and we'd like to match the correct one.
+ osdistro = osname.split("-unknown")[0]
+ osname = self.latest_os_version(osdistro)
+ logging.debug("Detected location=%s as os=%s-unknown. "
+ "Converting that to the latest %s OS version=%s",
+ osdistro, osdistro, location, osname)
return osname
@@ -236,8 +240,12 @@ class _OSDB(object):
return None
return oses[0]
- def latest_fedora_version(self):
- return self.latest_regex("fedora[0-9]+")
+ def latest_os_version(self, osdistro):
+ regex = osdistro + "[0-9]+"
+ if osdistro[-1].isdigit():
+ regex = osdistro + "\.[0-9]+"
+
+ return self.latest_regex(regex)
#####################
--
2.19.1
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
