[PATCH 2/3] Return full device object of selected optical drive

Jesse Keating jkeating at redhat.com
Mon Aug 27 23:57:39 UTC 2012


The full device is more useful than just the path.  Callers can get the
path if they want it.
---
 pyanaconda/ui/gui/spokes/source.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index 40d1e69..1d32a95 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -435,6 +435,7 @@ class SourceSpoke(NormalSpoke):
                 return
 
             self.data.method.method = "cdrom"
+            self.payload.install_device = dev
             if old_source.method == "cdrom":
                 # XXX maybe we should always redo it for cdrom in case they
                 #     switched disks
@@ -747,7 +748,7 @@ class SourceSpoke(NormalSpoke):
         dev = None
         for child in self._autodetectMediaBox.get_children():
             if child.get_chosen():
-                dev = child.path
+                dev = child
                 break
 
         return dev
@@ -822,7 +823,7 @@ class SourceSpoke(NormalSpoke):
 
         dialog = MediaCheckDialog(self.data)
         with enlightbox(self.window, dialog.window):
-            dialog.run(dev)
+            dialog.run(dev.path)
 
     def on_protocol_changed(self, combo):
         proxyButton = self.builder.get_object("proxyButton")
-- 
1.7.11.2



More information about the anaconda-patches mailing list