[PATCH 01/10] Move UI tasksel step before reposetup step.

[Radek Vykydal <rvykydal@xxxxxxxxxx>]

The step is renamed to repotasksel as it is for editing/selection for
repositories and selection of tasks. The latter should probably go into its own
UI screen or to group selection screen as it requires repos to be set up to
obtain group information. This can be done later, for now I don't
change the UI screens.

The main reason for the change of order is simply that repos should be
set up after their editing/selection. This way we can get rid of mixing
of additional repo setup stuff with repo editing UI, and handle errors
in repo specification more gracefuly (like disabling the repo).
---
 pyanaconda/dispatch.py     |    2 +-
 pyanaconda/gui.py          |    2 +-
 pyanaconda/installclass.py |    4 ++--
 pyanaconda/kickstart.py    |    8 ++++----
 pyanaconda/text.py         |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
index 39aa2d9..94f70f2 100644
--- a/pyanaconda/dispatch.py
+++ b/pyanaconda/dispatch.py
@@ -95,8 +95,8 @@ installSteps = [
     ("upgbootloader", ),
     ("bootloadersetup", bootloaderSetupChoices, ),
     ("bootloader", ),
+    ("repotasksel", ),
     ("reposetup", doBackendSetup, ),
-    ("tasksel", ),
     ("basepkgsel", doBasePackageSelect, ),
     ("group-selection", ),
     ("postselection", doPostSelection, ),
diff --git a/pyanaconda/gui.py b/pyanaconda/gui.py
index 1853b2d..52b47a0 100755
--- a/pyanaconda/gui.py
+++ b/pyanaconda/gui.py
@@ -79,7 +79,7 @@ stepToClass = {
     "network" : ("network_gui", "NetworkWindow"),
     "timezone" : ("timezone_gui", "TimezoneWindow"),
     "accounts" : ("account_gui", "AccountWindow"),
-    "tasksel": ("task_gui", "TaskWindow"),    
+    "repotasksel": ("task_gui", "TaskWindow"),
     "group-selection": ("package_gui", "GroupSelectionWindow"),
     "install" : ("progress_gui", "InstallProgressWindow"),
     "complete" : ("congrats_gui", "CongratulationWindow"),
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 3c6a579..920c710 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -94,9 +94,9 @@ class BaseInstallClass(object):
 		 "network",
 		 "timezone",
 		 "accounts",
+		 "repotasksel",
                  "reposetup",
                  "basepkgsel",
-		 "tasksel",                                  
 		 "postselection",
                  "reipl",
 		 "install",
@@ -125,7 +125,7 @@ class BaseInstallClass(object):
 
         # allow backends to disable interactive package selection
         if not anaconda.backend.supportsPackageSelection:
-            dispatch.skipStep("tasksel", skip = 1, permanent=1)
+            dispatch.skipStep("repotasksel", skip = 1, permanent=1)
             dispatch.skipStep("group-selection", skip = 1, permanent=1)
 
         # allow install classes to turn off the upgrade 
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 4bafb27..04607a9 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1472,18 +1472,18 @@ def setSteps(anaconda):
 
     # If the package section included anything, skip group selection.
     if ksdata.upgrade.upgrade:
-        ksdata.skipSteps.extend(["tasksel", "group-selection"])
+        ksdata.skipSteps.extend(["repotasksel", "group-selection"])
 
         # Special check for this, since it doesn't make any sense.
         if ksdata.packages.seen:
             warnings.warn("Ignoring contents of %packages section due to upgrade.")
     elif havePackages(ksdata.packages):
-        ksdata.skipSteps.extend(["tasksel", "group-selection"])
+        ksdata.skipSteps.extend(["repotasksel", "group-selection"])
     else:
         if ksdata.packages.seen:
-            ksdata.skipSteps.extend(["tasksel", "group-selection"])
+            ksdata.skipSteps.extend(["repotasksel", "group-selection"])
         else:
-            ksdata.showSteps.extend(["tasksel", "group-selection"])
+            ksdata.showSteps.extend(["repotasksel", "group-selection"])
 
     for n in ksdata.skipSteps:
         dispatch.skipStep(n)
diff --git a/pyanaconda/text.py b/pyanaconda/text.py
index 3e52978..835421d 100644
--- a/pyanaconda/text.py
+++ b/pyanaconda/text.py
@@ -60,7 +60,7 @@ stepToClasses = {
     "network" : ("network_text", "HostnameWindow"),
     "timezone" : ("timezone_text", "TimezoneWindow"),
     "accounts" : ("userauth_text", "RootPasswordWindow"),
-    "tasksel": ("task_text", "TaskWindow"),
+    "repotasksel": ("task_text", "TaskWindow"),
     "install" : ("progress_text", "setupForInstall"),
     "complete" : ("complete_text", "FinishedWindow"),
 }
-- 
1.7.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list