fixup temporary warnings

1 files changed, 36 insertions, 33 deletions

diff --git a/anaconda b/anaconda
index 95ef6d998..41723d312 100755
--- a/anaconda
+++ b/anaconda
@@ -1054,39 +1054,42 @@ intf = InstallInterface ()
 
 # imports after setting up the path
 if method:
-    if method.startswith('cdrom://'):
-        from image import CdromInstallMethod
-        methodobj = CdromInstallMethod(method[8:], rootPath, intf)
-    elif method.startswith('nfs:/'):
-        from image import NfsInstallMethod
-        methodobj = NfsInstallMethod(method[5:], rootPath, intf)
-    elif method.startswith('nfsiso:/'):
-        from image import NfsIsoInstallMethod
-        methodobj = NfsIsoInstallMethod(method[8:], rootPath, intf)
-    elif method.startswith('ftp://') or method.startswith('http://'):
-        from urlinstall import UrlInstallMethod
-        methodobj = UrlInstallMethod(method, rootPath, intf)
-    elif method.startswith('hd://'):
-        from harddrive import HardDriveInstallMethod
-        methodobj = HardDriveInstallMethod(method[5:], rootPath, intf)
-    else:
-        log.critical (_("unknown install method: %s"), method)
-        sys.exit(1)
-
-if not method.startswith('nfs:/'):
-    intf.messageWindow(_("Install Method Unavailable"),
-                       _("Anaconda is undergoing major backend work "
-                       "currently only nfs tree installs are supported. "
-                       "We apologise for any inconvenience. "
-                       "Normal service will be resumed ASAP."))
-    sys.exit(42)
-else:    
-    intf.messageWindow(_("Install Method Under Construction")
-                       _("Anaconda is undergoing major backend work "
-                       "currently only nfs tree installs are supported "
-                       "and package selection is turned off. "
-                       "We are aware of this and and normal service, "
-                       "will be resumed ASAP."))
+        if not method.startswith('nfs:/'):
+            intf.messageWindow(_("Install Method Unavailable"),
+                               _("Anaconda is undergoing major backend work "
+                               "currently only nfs tree installs are supported. "
+                               "We apologise for any inconvenience. "
+                               "Normal service will be resumed ASAP."))
+            sys.exit(42)
+        else:    
+            intf.messageWindow(_("Install Method Under Construction"),
+                               _("Anaconda is undergoing major backend work "
+                               "currently only nfs tree installs are supported "
+                               "and package selection is turned off. "
+                               "We are aware of this and and normal service, "
+                               "will be resumed ASAP."))
+            from image import NfsInstallMethod
+            methodobj = NfsInstallMethod(method[5:], rootPath, intf)
+#    elif method.startswith('nfsiso:/'):
+#
+#    if method.startswith('cdrom://'):
+#        from image import CdromInstallMethod
+#        methodobj = CdromInstallMethod(method[8:], rootPath, intf)
+#    elif method.startswith('nfs:/'):
+#        from image import NfsInstallMethod
+#        methodobj = NfsInstallMethod(method[5:], rootPath, intf)
+#    elif method.startswith('nfsiso:/'):
+#        from image import NfsIsoInstallMethod
+#        methodobj = NfsIsoInstallMethod(method[8:], rootPath, intf)
+#    elif method.startswith('ftp://') or method.startswith('http://'):
+#        from urlinstall import UrlInstallMethod
+#        methodobj = UrlInstallMethod(method, rootPath, intf)
+#    elif method.startswith('hd://'):
+#        from harddrive import HardDriveInstallMethod
+#        methodobj = HardDriveInstallMethod(method[5:], rootPath, intf)
+#    else:
+#        log.critical (_("unknown install method: %s"), method)
+#        sys.exit(1)
 
 floppyDevice = floppy.probeFloppyDevice()