[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Prevent traceback when there are no network devices (#469339)





David Cantrell wrote:
If a user boots from boot.iso, the installer will bring up the net
config dialog to configure the network interface so packages can
be found and installed.  If a user has no available network devices,
the window appears but nothing is in the combo box.  If they click
the combo box, you get a traceback.

This patch returns False from all enableNetwork() functions so the
user sees the 'No Network Available' dialog and is given the Exit
Installer button.

Looks good, but you should file a bug about boot.iso installs only complaining about not having network after formatting the disks, we will want to fix that for F-11.

Regards,

Hans

---
 gui.py    |    2 ++
 rescue.py |    2 ++
 text.py   |    2 ++
 3 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/gui.py b/gui.py
index eb356f4..2fcc9e9 100755
--- a/gui.py
+++ b/gui.py
@@ -1162,6 +1162,8 @@ class InstallInterface:
         pass
def enableNetwork(self, anaconda):
+        if len(anaconda.id.network.netdevices) == 0:
+            return False
         from netconfig_dialog import NetworkConfigurator
         net = NetworkConfigurator(anaconda.id.network)
         ret = net.run()
diff --git a/rescue.py b/rescue.py
index a9624ec..67d573b 100644
--- a/rescue.py
+++ b/rescue.py
@@ -82,6 +82,8 @@ class RescueInterface:
 	    return OkCancelWindow(self.screen, title, text)
def enableNetwork(self, anaconda):
+        if len(anaconda.id.network.netdevices) == 0:
+            return False
         from netconfig_text import NetworkConfiguratorText
         w = NetworkConfiguratorText(self.screen, anaconda)
         ret = w.run()
diff --git a/text.py b/text.py
index 7b57962..d3dd568 100644
--- a/text.py
+++ b/text.py
@@ -496,6 +496,8 @@ class InstallInterface:
         return (passphrase, isglobal)
def enableNetwork(self, anaconda):
+        if len(anaconda.id.network.netdevices) == 0:
+            return False
         from netconfig_text import NetworkConfiguratorText
         w = NetworkConfiguratorText(self.screen, anaconda)
         ret = w.run()


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]