[virt-tools-list] [virt-manager PATCH 5/9] installertreemedia: Add os_tree to the _LocationData class

Fabiano Fidêncio fidencio at redhat.com
Tue Jul 16 15:14:28 UTC 2019


Let's get the _OsTree object and have it added to the _LocationData
class.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 virtinst/install/installertreemedia.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/virtinst/install/installertreemedia.py b/virtinst/install/installertreemedia.py
index 4f8d336c..6b98e75b 100644
--- a/virtinst/install/installertreemedia.py
+++ b/virtinst/install/installertreemedia.py
@@ -30,10 +30,11 @@ def _is_url(url):
 
 
 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.kernel_pairs = kernel_pairs
         self.os_media = os_media
+        self.os_tree = os_tree
 
         self.kernel_url_arg = None
         if self.os_variant:
@@ -174,6 +175,7 @@ class InstallerTreeMedia(object):
         store = None
         os_variant = None
         os_media = None
+        os_tree = None
         kernel_paths = []
         has_location_kernel = bool(
                 self._location_kernel and self._location_initrd)
@@ -189,12 +191,13 @@ class InstallerTreeMedia(object):
             kernel_paths = store.get_kernel_paths()
             os_variant = store.get_osdict_info()
             os_media = store.get_os_media()
+            os_tree = store.get_os_tree()
         if has_location_kernel:
             kernel_paths = [
                     (self._location_kernel, self._location_initrd)]
 
         self._cached_data = _LocationData(os_variant, kernel_paths,
-                os_media)
+                os_media, os_tree)
         return self._cached_data
 
     def _prepare_kernel_url(self, guest, cache, fetcher):
-- 
2.21.0




More information about the virt-tools-list mailing list