|
 |
fbcaed |
From 81bc3c3495c5ada22ac43aac5773888dda27c7b6 Mon Sep 17 00:00:00 2001
|
|
|
fbcaed |
From: Colin Walters <walters@verbum.org>
|
|
|
fbcaed |
Date: Fri, 4 Apr 2014 23:49:51 +0000
|
|
|
fbcaed |
Subject: [PATCH 01/20] gui/spokes/software: Enable iff payload is
|
|
|
fbcaed |
PackagePayload
|
|
|
fbcaed |
|
|
|
fbcaed |
This should be the equivalent of the livecd test.
|
|
|
fbcaed |
|
|
|
fbcaed |
Resolves: rhbz#1113535
|
|
|
fbcaed |
Port of rpmostreepayload patches from master
|
|
|
fbcaed |
commit 63e5d9cb577428519d61a279c3b53442877f9c51
|
|
|
fbcaed |
---
|
|
|
fbcaed |
pyanaconda/ui/gui/spokes/software.py | 4 ++--
|
|
|
fbcaed |
pyanaconda/ui/gui/spokes/source.py | 4 ++--
|
|
|
fbcaed |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
fbcaed |
|
|
|
fbcaed |
diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
|
|
|
fbcaed |
index b21866b..fe711b5 100644
|
|
|
fbcaed |
--- a/pyanaconda/ui/gui/spokes/software.py
|
|
|
fbcaed |
+++ b/pyanaconda/ui/gui/spokes/software.py
|
|
|
fbcaed |
@@ -24,7 +24,7 @@ from gi.repository import Gdk, Gtk
|
|
|
fbcaed |
|
|
|
fbcaed |
from pyanaconda.flags import flags
|
|
|
fbcaed |
from pyanaconda.i18n import _, N_
|
|
|
fbcaed |
-from pyanaconda.packaging import MetadataError
|
|
|
fbcaed |
+from pyanaconda.packaging import MetadataError, PackagePayload
|
|
|
fbcaed |
from pyanaconda.threads import threadMgr, AnacondaThread
|
|
|
fbcaed |
from pyanaconda import constants
|
|
|
fbcaed |
|
|
|
fbcaed |
@@ -164,7 +164,7 @@ class SoftwareSelectionSpoke(NormalSpoke):
|
|
|
fbcaed |
|
|
|
fbcaed |
@property
|
|
|
fbcaed |
def showable(self):
|
|
|
fbcaed |
- return not flags.livecdInstall and not self.data.method.method == "liveimg"
|
|
|
fbcaed |
+ return isinstance(self.payload, PackagePayload)
|
|
|
fbcaed |
|
|
|
fbcaed |
@property
|
|
|
fbcaed |
def status(self):
|
|
|
fbcaed |
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
|
|
|
fbcaed |
index 3fa3234..e399d85 100644
|
|
|
fbcaed |
--- a/pyanaconda/ui/gui/spokes/source.py
|
|
|
fbcaed |
+++ b/pyanaconda/ui/gui/spokes/source.py
|
|
|
fbcaed |
@@ -41,7 +41,7 @@ from pyanaconda.ui.gui.utils import enlightbox, gtk_action_wait
|
|
|
fbcaed |
from pyanaconda.iutil import ProxyString, ProxyStringError, cmp_obj_attrs
|
|
|
fbcaed |
from pyanaconda.ui.gui.utils import gtk_call_once, really_hide, really_show
|
|
|
fbcaed |
from pyanaconda.threads import threadMgr, AnacondaThread
|
|
|
fbcaed |
-from pyanaconda.packaging import PayloadError, MetadataError
|
|
|
fbcaed |
+from pyanaconda.packaging import PayloadError, MetadataError, PackagePayload
|
|
|
fbcaed |
from pyanaconda import constants
|
|
|
fbcaed |
|
|
|
fbcaed |
from blivet.util import get_mount_paths
|
|
|
fbcaed |
@@ -765,7 +765,7 @@ class SourceSpoke(NormalSpoke):
|
|
|
fbcaed |
|
|
|
fbcaed |
@property
|
|
|
fbcaed |
def showable(self):
|
|
|
fbcaed |
- return not flags.livecdInstall and not self.data.method.method == "liveimg"
|
|
|
fbcaed |
+ return isinstance(self.payload, PackagePayload)
|
|
|
fbcaed |
|
|
|
fbcaed |
def _mirror_active(self):
|
|
|
fbcaed |
return self._protocolComboBox.get_active() == PROTOCOL_MIRROR
|
|
|
fbcaed |
--
|
|
|
fbcaed |
1.9.3
|
|
|
fbcaed |
|