summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2010-02-25 10:11:03 -0500
committerChris Lumens <clumens@redhat.com>2010-02-25 16:37:05 -0500
commitc61f9d8842baab8431ed1bb10af799e624fe051a (patch)
tree43ee320c2977536443f40eb8669aa44c3ec0375e
parent8f8a58da070c7f4983c35d60939372e70414bfb4 (diff)
downloadanaconda-c61f9d8842baab8431ed1bb10af799e624fe051a.tar.gz
anaconda-c61f9d8842baab8431ed1bb10af799e624fe051a.tar.xz
anaconda-c61f9d8842baab8431ed1bb10af799e624fe051a.zip
Skip the filter/cleardisk steps on upgrades, too (#568334).
We run upgrade.setSteps late, from the UI should you select "upgrade" from the proper screen. This means the earlier text.setSteps gets overridden so we need to add a permanent=1 to all these.
-rw-r--r--text.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/text.py b/text.py
index 898bc2630..23bc4bb0d 100644
--- a/text.py
+++ b/text.py
@@ -663,10 +663,10 @@ class InstallInterface(InstallInterfaceBase):
self.screen.finish()
def setSteps(self, anaconda):
- anaconda.dispatch.skipStep("filtertype")
- anaconda.dispatch.skipStep("filter")
- anaconda.dispatch.skipStep("cleardiskssel")
- anaconda.dispatch.skipStep("group-selection")
+ anaconda.dispatch.skipStep("filtertype", permanent=1)
+ anaconda.dispatch.skipStep("filter", permanent=1)
+ anaconda.dispatch.skipStep("cleardiskssel", permanent=1)
+ anaconda.dispatch.skipStep("group-selection", permanent=1)
def killSelf(screen):
screen.finish()