Add new repos to the installclass's list so they appear when going back to this

screen.  Setup repos as soon as they are added to catch errors, but setup
installclass default repos when next is clicked so they are ready for use.

1 files changed, 12 insertions, 2 deletions

diff --git a/iw/task_gui.py b/iw/task_gui.py
index c42405cb2..d302ad2e8 100644
--- a/iw/task_gui.py
+++ b/iw/task_gui.py
@@ -42,7 +42,11 @@ class TaskWindow(InstallWindow):
         for (cb, reponame, repo) in repos:
             if cb:
                 repo.enable()
-                self._setupRepo(repo)
+
+                # Setup any repositories that were in the installclass's
+                # default list.
+                if not repo.ready():
+                    self._setupRepo(repo)
             else:
                 repo.disable()
 
@@ -77,7 +81,7 @@ class TaskWindow(InstallWindow):
                     "correctly generated.\n\n%s" %(e,)),
                                     type="ok", custom_icon="error")
             self.backend.ayum.repos.delete(repo.id)
-            return
+            return False
 
         if not repo.groups_added:
             self.intf.messageWindow(_("Warning"),
@@ -86,6 +90,8 @@ class TaskWindow(InstallWindow):
                              "from the repository not work") %(repo.id,),
                                     type="warning")
 
+        return True
+
     def _addRepo(self, *args):
         # FIXME: Need to bring up the network
         if not network.hasActiveNetDev():
@@ -142,8 +148,12 @@ class TaskWindow(InstallWindow):
                         "URL.") % reponame, type="ok", custom_icon="error")
                 continue
 
+            if not self._setupRepo(repo):
+                continue
+
             s = self.xml.get_widget("repoList").get_model()
             s.append([repo.isEnabled(), repo.name, repo])
+            self.repos[repo.name] = (repo.baseurl[0], None)
 
             break