[master/rhel7 2/2] Use DataHolder for TUI nfs data (#1034427)

Brian C. Lane bcl at redhat.com
Sat Jan 18 00:21:18 UTC 2014


Previously it was directly accessing the data.method class which splits
the server and directory, this didn't allow for the full server:dir to
be displayed by the TUI interface.
---
 pyanaconda/ui/tui/spokes/source.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyanaconda/ui/tui/spokes/source.py b/pyanaconda/ui/tui/spokes/source.py
index 0348a64..3afe01b 100644
--- a/pyanaconda/ui/tui/spokes/source.py
+++ b/pyanaconda/ui/tui/spokes/source.py
@@ -28,6 +28,7 @@ from pyanaconda.threads import threadMgr, AnacondaThread
 from pyanaconda.packaging import PayloadError, MetadataError
 from pyanaconda.i18n import N_, _
 from pyanaconda.image import opticalInstallMedia, potentialHdisoSources
+from pyanaconda.iutil import DataHolder
 
 from pyanaconda.constants import THREAD_SOURCE_WATCHER, THREAD_SOFTWARE_WATCHER, THREAD_PAYLOAD
 from pyanaconda.constants import THREAD_PAYLOAD_MD, THREAD_STORAGE, THREAD_STORAGE_WATCHER
@@ -402,9 +403,13 @@ class SpecifyNFSRepoSpoke(SourceSwitchHandler, EditTUISpoke):
         EditTUISpoke.__init__(self, app, data, storage, payload, instclass)
         SourceSwitchHandler.__init__(self, data, storage)
         self.selection = selection
-        self.args = self.data.method
         self.errors = errors
 
+        nfs = self.data.method
+        self.args = DataHolder(server="", opts=nfs.opts or "")
+        if nfs.method == "nfs" and nfs.server and nfs.dir:
+            self.args.server = "%s:%s" % (nfs.server, nfs.dir)
+
     def refresh(self, args=None):
         """ Refresh window. """
         return EditTUISpoke.refresh(self, args)
-- 
1.8.4.2



More information about the anaconda-patches mailing list