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

[PATCH] Enable network if it is needed when repo is added in UI (#577803).



Network has to be enabled before setting the repo up so that repo metadata can
be checked.

The bug/patch is regarding the cases where network have not been anabled yet
and user is adding network-requiring repo, or modifying non-net-requiring repo
to a requiring one (e.g. DVD install -> http install).

It can be worked around (apart from restarting install with ks, or something
that would bring up network earlier) by canceling the dialog, and checking or
modifying existing (*if there is any*) network requiring repo which would bring
up network enablement dialog.

I think the patch should go to master, rhel6-branch, and I'd also propose it
as f13 blocker.


---
 iw/task_gui.py |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/iw/task_gui.py b/iw/task_gui.py
index 0a18da8..bdc92ae 100644
--- a/iw/task_gui.py
+++ b/iw/task_gui.py
@@ -42,6 +42,10 @@ import logging
 log = logging.getLogger("anaconda")
 
 def setupRepo(anaconda, repo):
+    if repo.needsNetwork() and not network.hasActiveNetDev():
+        if not anaconda.intf.enableNetwork():
+            return False
+        urlgrabber.grabber.reset_curl_obj()
     try:
         anaconda.backend.doRepoSetup(anaconda, thisrepo=repo.id, fatalerrors=False)
         anaconda.backend.doSackSetup(anaconda, thisrepo=repo.id, fatalerrors=False)
@@ -537,12 +541,6 @@ class TaskWindow(InstallWindow):
         if dialog.run() in [gtk.RESPONSE_CANCEL, gtk.RESPONSE_DELETE_EVENT]:
             return gtk.RESPONSE_CANCEL
 
-        if dialog.repo.needsNetwork() and not network.hasActiveNetDev():
-            if not self.anaconda.intf.enableNetwork():
-                return gtk.RESPONSE_CANCEL
-
-            urlgrabber.grabber.reset_curl_obj()
-
         s = self.xml.get_widget("repoList").get_model()
         s.append([dialog.repo.isEnabled(), dialog.repo.name, dialog.repo])
 
-- 
1.6.0.6


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