mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-03-12 20:58:28 +03:00
installertreemedia: Add os_tree to the _LocationData class
Let's get the _OsTree object and have it added to the _LocationData class. Reviewed-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
parent
016cc1d866
commit
5c494cef66
@ -30,10 +30,11 @@ def _is_url(url):
|
|||||||
|
|
||||||
|
|
||||||
class _LocationData(object):
|
class _LocationData(object):
|
||||||
def __init__(self, os_variant, kernel_pairs, os_media):
|
def __init__(self, os_variant, kernel_pairs, os_media, os_tree):
|
||||||
self.os_variant = os_variant
|
self.os_variant = os_variant
|
||||||
self.kernel_pairs = kernel_pairs
|
self.kernel_pairs = kernel_pairs
|
||||||
self.os_media = os_media
|
self.os_media = os_media
|
||||||
|
self.os_tree = os_tree
|
||||||
|
|
||||||
self.kernel_url_arg = None
|
self.kernel_url_arg = None
|
||||||
if self.os_variant:
|
if self.os_variant:
|
||||||
@ -174,6 +175,7 @@ class InstallerTreeMedia(object):
|
|||||||
store = None
|
store = None
|
||||||
os_variant = None
|
os_variant = None
|
||||||
os_media = None
|
os_media = None
|
||||||
|
os_tree = None
|
||||||
kernel_paths = []
|
kernel_paths = []
|
||||||
has_location_kernel = bool(
|
has_location_kernel = bool(
|
||||||
self._location_kernel and self._location_initrd)
|
self._location_kernel and self._location_initrd)
|
||||||
@ -189,12 +191,13 @@ class InstallerTreeMedia(object):
|
|||||||
kernel_paths = store.get_kernel_paths()
|
kernel_paths = store.get_kernel_paths()
|
||||||
os_variant = store.get_osdict_info()
|
os_variant = store.get_osdict_info()
|
||||||
os_media = store.get_os_media()
|
os_media = store.get_os_media()
|
||||||
|
os_tree = store.get_os_tree()
|
||||||
if has_location_kernel:
|
if has_location_kernel:
|
||||||
kernel_paths = [
|
kernel_paths = [
|
||||||
(self._location_kernel, self._location_initrd)]
|
(self._location_kernel, self._location_initrd)]
|
||||||
|
|
||||||
self._cached_data = _LocationData(os_variant, kernel_paths,
|
self._cached_data = _LocationData(os_variant, kernel_paths,
|
||||||
os_media)
|
os_media, os_tree)
|
||||||
return self._cached_data
|
return self._cached_data
|
||||||
|
|
||||||
def _prepare_kernel_url(self, guest, cache, fetcher):
|
def _prepare_kernel_url(self, guest, cache, fetcher):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user