NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

installer: Don't needlessly pass around scratchdir

Browse Source
This commit is contained in:
Cole Robinson 2014-09-07 13:35:34 -04:00
parent a722eeac78
commit 1247e8d43e
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
virtinst/distroinstaller.py
View File

@ -407,9 +407,10 @@ class DistroInstaller(Installer):
return val
def _prepare(self, guest, meter, scratchdir):
logging.debug("Using scratchdir=%s", scratchdir)
def _prepare(self, guest, meter):
mediatype = self._get_media_type()
scratchdir = util.make_scratchdir(guest.conn, guest.type)
logging.debug("Using scratchdir=%s", scratchdir)
# Test suite manually injected a boot kernel
if self._install_kernel and not self.scratchdir_required():
@ -423,8 +424,8 @@ class DistroInstaller(Installer):
dev = self._prepare_local()
if mediatype != MEDIA_CDROM_PATH:
fetcher = urlfetcher.fetcherForURI(self.location,
scratchdir, meter)
fetcher = urlfetcher.fetcherForURI(self.location, scratchdir,
meter)
try:
try:
fetcher.prepareLocation()

3
virtinst/guest.py
View File

@ -276,8 +276,7 @@ class Guest(XMLBuilder):
ignore = dry
# Fetch install media, prepare installer devices
self.installer.prepare(self, meter,
util.make_scratchdir(self.conn, self.type))
self.installer.prepare(self, meter)
# Initialize install device list
for dev in self.installer.install_devices:

10
virtinst/installer.py
View File

@ -153,10 +153,9 @@ class Installer(object):
def _validate_location(self, val):
return val
def _prepare(self, guest, meter, scratchdir):
def _prepare(self, guest, meter):
ignore = guest
ignore = meter
ignore = scratchdir
##############
@ -195,10 +194,10 @@ class Installer(object):
self._tmpfiles = []
self.install_devices = []
def prepare(self, guest, meter, scratchdir):
def prepare(self, guest, meter):
self.cleanup()
try:
self._prepare(guest, meter, scratchdir)
self._prepare(guest, meter)
except:
self.cleanup()
raise
@ -251,10 +250,9 @@ class LiveCDInstaller(Installer):
def _validate_location(self, val):
return self._make_cdrom_dev(val).path
def _prepare(self, guest, meter, scratchdir):
def _prepare(self, guest, meter):
ignore = guest
ignore = meter
ignore = scratchdir
self.install_devices.append(self._make_cdrom_dev(self.location))
def _get_bootdev(self, isinstall, guest):
return OSXML.BOOT_DEVICE_CDROM