shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-10-27 10:25:25 +03:00
Code Issues Projects Releases Wiki Activity

urldetect: Centralize setting _kernel_paths from treeinfo

Browse Source
This commit is contained in:
Cole Robinson 2019-01-29 14:52:16 -05:00
parent 79345369a7
commit a7be538003
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
virtinst/urldetect.py
View File

@ -25,6 +25,7 @@ class _DistroCache(object):
self.treeinfo_family = None
self.treeinfo_version = None
self.treeinfo_name = None
self.treeinfo_matched = False
self.suse_content = None
self.checked_for_suse_content = False
@ -73,6 +74,7 @@ class _DistroCache(object):
return False
ret = bool(re.match(famregex, self.treeinfo_family))
self.treeinfo_matched = ret
if not ret:
logging.debug("Didn't match treeinfo family regex=%s", famregex)
return ret
@ -318,7 +320,10 @@ class Distro(object):
self._os_variant = None
self._kernel_paths = []
self._set_kernel_paths()
if self.cache.treeinfo_matched:
self._kernel_paths = self.cache.get_treeinfo_media(self.type)
else:
self._set_kernel_paths()
@classmethod
@ -326,7 +331,7 @@ class Distro(object):
raise NotImplementedError
def _set_kernel_paths(self):
raise NotImplementedError()
pass
def acquireKernel(self):
kernelpath = None
@ -383,9 +388,6 @@ class RedHatDistro(Distro):
def is_valid(cls, cache):
raise NotImplementedError
def _set_kernel_paths(self):
self._kernel_paths = self.cache.get_treeinfo_media(self.type)
def _get_kernel_url_arg(self):
def _is_old_rhdistro():
m = re.match(r"^.*[^0-9\.]+([0-9\.]+)$", self._os_variant or "")
@ -515,11 +517,7 @@ class SuseDistro(Distro):
return False
def _set_kernel_paths(self):
if not self.cache.suse_content:
# This means we matched on treeinfo
self._kernel_paths = self.cache.get_treeinfo_media(self.type)
return
# We only reach here if no treeinfo was matched
tree_arch = self.cache.suse_content.tree_arch
if re.match(r'i[4-9]86', tree_arch):
@ -615,9 +613,6 @@ class SuseDistro(Distro):
var = self._detect_osdict_from_suse_content()
return var
def _get_kernel_url_arg(self):
return "install"
class SLESDistro(SuseDistro):
PRETTY_NAME = "SLES"
@ -834,10 +829,10 @@ class GenericTreeinfoDistro(Distro):
@classmethod
def is_valid(cls, cache):
return bool(cache.treeinfo)
def _set_kernel_paths(self):
self._kernel_paths = self.cache.get_treeinfo_media(self.type)
if cache.treeinfo:
cache.treeinfo_matched = True
return True
return False
# Build list of all *Distro classes