From 1247e8d43ed354b2f6fc680fe76b5586b815ba3d Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 7 Sep 2014 13:35:34 -0400
Subject: [PATCH] installer: Don't needlessly pass around scratchdir

---
 virtinst/distroinstaller.py |  9 +++++----
 virtinst/guest.py           |  3 +--
 virtinst/installer.py       | 10 ++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/virtinst/distroinstaller.py b/virtinst/distroinstaller.py
index 9b3c56248..6a8f1e098 100644
--- a/virtinst/distroinstaller.py
+++ b/virtinst/distroinstaller.py
@@ -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()
diff --git a/virtinst/guest.py b/virtinst/guest.py
index 36c0625ac..c2ab18878 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -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:
diff --git a/virtinst/installer.py b/virtinst/installer.py
index ac8f899e7..6dbfe6d08 100644
--- a/virtinst/installer.py
+++ b/virtinst/installer.py
@@ -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