make some sanity out of how we use method* vars

1 files changed, 23 insertions, 24 deletions

diff --git a/anaconda b/anaconda
index 14159768f..8afecada8 100755
--- a/anaconda
+++ b/anaconda
@@ -253,7 +253,7 @@ if (progmode == 'rescue'):
     configFile = configFileData.configFileData()
     configFileData = configFile.getConfigData()
     
-    id = instdata.InstallData([], "fd0", configFileData)
+    id = instdata.InstallData([], "fd0", configFileData, method)
     rescue.runRescue(rootPath, not rescue_nomount, id)
 
     # shouldn't get back here
@@ -590,44 +590,44 @@ else:
 if method:
     if method.startswith('cdrom://'):
         from image import CdromInstallMethod
-        method = CdromInstallMethod(method[8:], intf.messageWindow,
+        methodobj = CdromInstallMethod(method[8:], intf.messageWindow,
 				    intf.progressWindow, rootPath)
     elif method.startswith('nfs:/'):
         from image import NfsInstallMethod
-        method = NfsInstallMethod(method[5:], rootPath)
+        methodobj = NfsInstallMethod(method[5:], rootPath)
     elif method.startswith('nfsiso:/'):
         from image import NfsIsoInstallMethod
-        method = NfsIsoInstallMethod(method[8:], intf.messageWindow, rootPath)
+        methodobj = NfsIsoInstallMethod(method[8:], intf.messageWindow, rootPath)
     elif method.startswith('ftp://') or method.startswith('http://'):
         from urlinstall import UrlInstallMethod
-        method = UrlInstallMethod(method, rootPath)
+        methodobj = UrlInstallMethod(method, rootPath)
     elif method.startswith('hd://'):
-        method = method[5:]
+        tmpmethod = method[5:]
 
-        i = string.index(method, ":")
-        drive = method[0:i]
-        method = method[i+1:]
+        i = string.index(tmpmethod, ":")
+        drive = tmpmethod[0:i]
+        tmpmethod = tmpmethod[i+1:]
         
-        i = string.index(method, "/")
-        type = method[0:i]
-        dir = method[i+1:]
+        i = string.index(tmpmethod, "/")
+        type = tmpmethod[0:i]
+        dir = tmpmethod[i+1:]
 
         from harddrive import HardDriveInstallMethod
-        method = HardDriveInstallMethod(drive, type, dir, intf.messageWindow,
+        methodobj = HardDriveInstallMethod(drive, type, dir, intf.messageWindow,
                                         rootPath)
     elif method.startswith('oldhd://'):
-        method = method[8:]
+        tmpmethod = method[8:]
 
-        i = string.index(method, ":")
-        drive = method[0:i]
-        method = method[i+1:]
+        i = string.index(tmpmethod, ":")
+        drive = tmpmethod[0:i]
+        tmpmethod = tmpmethod[i+1:]
         
-        i = string.index(method, "/")
-        type = method[0:i]
-        dir = method[i+1:]
+        i = string.index(tmpmethod, "/")
+        type = tmpmethod[0:i]
+        dir = tmpmethod[i+1:]
         
         from harddrive import OldHardDriveInstallMethod
-        method = OldHardDriveInstallMethod(drive, type, dir, rootPath)
+        methodobj = OldHardDriveInstallMethod(drive, type, dir, rootPath)
     else:
         print "unknown install method:", method
         sys.exit(1)
@@ -638,8 +638,7 @@ floppyDevice = floppy.probeFloppyDevice()
 if not flags.test and flags.setupFilesystems:
     iutil.makeDriveDeviceNodes()
 
-id = instClass.installDataClass(extraModules, floppyDevice, configFileData)
-#id = instClass.installDataClass(extraModules, floppyDevice)
+id = instClass.installDataClass(extraModules, floppyDevice, configFileData, method)
 
 id.x_already_set = x_already_set
 
@@ -660,7 +659,7 @@ if kbd:
     
 instClass.setInstallData(id)
 
-dispatch = dispatch.Dispatcher(intf, id, method, rootPath)
+dispatch = dispatch.Dispatcher(intf, id, methodobj, rootPath)
 
 if lang:
     dispatch.skipStep("language", permanent = 1)