shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-03-23 06:50:13 +03:00
Code Issues Projects Releases Wiki Activity

virtinst/osdict: add a property for the OsinfoDb object

Browse Source 
This simplies the code a little bit by avoiding visible indirection
via the loader every time.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-11-26 18:51:49 +00:00 committed by Cole Robinson
parent 35ef83d628
commit 302ef1f096
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
virtinst/osdict.py
View File

@ -150,13 +150,15 @@ class _OSDB(object):
self.__os_loader = loader
return self.__os_loader
@property
def _os_db(self):
return self._os_loader.get_db()
@property
def _all_variants(self):
if not self.__all_variants:
loader = self._os_loader
allvariants = {}
db = loader.get_db()
oslist = db.get_os_list()
oslist = self._os_db.get_os_list()
for o in _OsinfoIter(oslist):
osi = _OsVariant(o)
for name in osi.get_short_ids():
@ -192,8 +194,8 @@ class _OSDB(object):
log.debug("Error creating libosinfo media object: %s", str(e))
return None
if not self._os_loader.get_db().identify_media(media):
return None # pragma: no cover
if not self._os_db.identify_media(media):
return [] # pragma: no cover
return media.get_os().get_short_id(), _OsMedia(media)
def guess_os_by_tree(self, location):
@ -212,14 +214,13 @@ class _OSDB(object):
"location=%s : %s", location, str(e))
return None
db = self._os_loader.get_db()
if hasattr(db, "identify_tree"):
if hasattr(self._os_db, "identify_tree"):
# osinfo_db_identify_tree is part of libosinfo 1.6.0
if not db.identify_tree(tree):
if not self._os_db.identify_tree(tree):
return None # pragma: no cover
return tree.get_os().get_short_id(), _OsTree(tree)
else: # pragma: no cover
osobj, treeobj = self._os_loader.get_db().guess_os_from_tree(tree)
osobj, treeobj = self._os_db.guess_os_from_tree(tree)
if not osobj:
return None # pragma: no cover
return osobj.get_short_id(), _OsTree(treeobj)