Attachment 935326 Details for Bug 1139142 – a patch with fix

a patch with fix

0001-tui-show-software-and-source-spoke-iff-payload-is-Pa.patch (text/plain), 2.42 KB, created by Radek Vykydal on 2014-09-08 12:32:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2014-09-08 12:32:59 UTC

Size: 2.42 KB

patch

obsolete

>From 655d6db6859f1551c12ffb1c099d9a1dfe981384 Mon Sep 17 00:00:00 2001
>From: Radek Vykydal <rvykydal@redhat.com>
>Date: Mon, 8 Sep 2014 14:14:33 +0200
>Subject: [PATCH rhel7-branch] tui: show software and source spoke iff payload is
> PackagePayload (#1139142)
>
>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
>

Actions: View

Attachments on bug 1139142: 935261 | 935262 | 935263 | 935264 | 935265 | 935266 | 935267 | 935268 | 935269 | 935270 | 935271 | 935326