openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

installertreemedia: Move url() to is_network_url() 

And then have callers just access location. It's more clear IMO
This commit is contained in:
Cole Robinson 2019-06-10 14:20:45 -04:00
parent 59f1eabf27
commit b7465fdcf8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtinst/installer.py
View File

@ -224,11 +224,12 @@ class Installer(object):
self._add_unattended_install_cdrom_device(guest, iso)
def _prepare_unattended_script(self, guest, meter):
url = None
if self._treemedia:
url = self._treemedia.url()
if self._treemedia.is_network_url():
url = self.location
os_media = self._treemedia.get_os_media(guest, meter)
else:
url = None
osguess = OSDB.guess_os_by_iso(self.cdrom)
os_media = osguess[1] if osguess else None

6
virtinst/installertreemedia.py
View File

@ -214,8 +214,8 @@ class InstallerTreeMedia(object):
if unattended_script:
kernel_args = self._prepare_unattended_data(
guest, unattended_script)
elif self.url() and cache.kernel_url_arg:
kernel_args = "%s=%s" % (cache.kernel_url_arg, self.url())
elif self.is_network_url() and cache.kernel_url_arg:
kernel_args = "%s=%s" % (cache.kernel_url_arg, self.location)
kernel, initrd = self._prepare_kernel_url(guest, cache, fetcher)
return kernel, initrd, kernel_args or ""
@ -237,7 +237,7 @@ class InstallerTreeMedia(object):
if self._media_type in [MEDIA_ISO]:
return self.location
def url(self):
def is_network_url(self):
if self._media_type in [MEDIA_URL]:
return self.location