[PATCH rhel7-branch] tui: show software and source spoke iff payload is PackagePayload (#1139142)
Radek Vykydal
rvykydal at redhat.com
Mon Sep 8 12:32:20 UTC 2014
Resolves: rhbz#1139142
The same what we do in GUI in
commit b2730604a2089236ebb94c22d96bbacc71235c59
---
pyanaconda/ui/tui/spokes/software.py | 4 ++--
pyanaconda/ui/tui/spokes/source.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/tui/spokes/software.py b/pyanaconda/ui/tui/spokes/software.py
index 9ce2d94..deb4254 100644
--- a/pyanaconda/ui/tui/spokes/software.py
+++ b/pyanaconda/ui/tui/spokes/software.py
@@ -23,7 +23,7 @@ from pyanaconda.flags import flags
from pyanaconda.ui.tui.spokes import NormalTUISpoke
from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget, CheckboxWidget
from pyanaconda.threads import threadMgr, AnacondaThread
-from pyanaconda.packaging import DependencyError
+from pyanaconda.packaging import DependencyError, PackagePayload
from pyanaconda.i18n import N_, _
from pyanaconda.constants import THREAD_PAYLOAD
@@ -53,7 +53,7 @@ class SoftwareSpoke(NormalTUISpoke):
@property
def showable(self):
- return not flags.livecdInstall and not self.data.method.method == "liveimg"
+ return isinstance(self.payload, PackagePayload)
@property
def status(self):
diff --git a/pyanaconda/ui/tui/spokes/source.py b/pyanaconda/ui/tui/spokes/source.py
index 3bc7aa4..b7940b6 100644
--- a/pyanaconda/ui/tui/spokes/source.py
+++ b/pyanaconda/ui/tui/spokes/source.py
@@ -25,7 +25,7 @@ from pyanaconda.ui.tui.spokes import EditTUISpoke, NormalTUISpoke
from pyanaconda.ui.tui.spokes import EditTUISpokeEntry as Entry
from pyanaconda.ui.tui.simpleline import TextWidget, ColumnWidget
from pyanaconda.threads import threadMgr, AnacondaThread
-from pyanaconda.packaging import payloadMgr
+from pyanaconda.packaging import payloadMgr, PackagePayload
from pyanaconda.i18n import N_, _
from pyanaconda.image import opticalInstallMedia, potentialHdisoSources
from pyanaconda.iutil import DataHolder
@@ -207,7 +207,7 @@ class SourceSpoke(SourceSwitchHandler, EditTUISpoke):
@property
def showable(self):
- return not flags.livecdInstall and not self.data.method.method == "liveimg"
+ return isinstance(self.payload, PackagePayload)
@property
def status(self):
--
1.9.3
More information about the anaconda-patches
mailing list