Author: lslezak Date: Thu Jan 7 13:46:56 2010 New Revision: 60257 URL: http://svn.opensuse.org/viewcvs/yast?rev=60257&view=rev Log: - pass the selected CD/DVD device to the package manager in case of multiple devices in the system (bnc#567403) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/SourceDialogs.ycp trunk/packager/src/modules/SourceManager.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=60257&r1=60256&r2=60257&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jan 7 13:46:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 12:16:03 UTC 2010 - lslezak@suse.cz + +- pass the selected CD/DVD device to the package manager in case + of multiple devices in the system (bnc#567403) + +------------------------------------------------------------------- Wed Jan 6 17:48:18 UTC 2010 - lslezak@suse.cz - do not reselect patterns which have been deselected by user Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialogs.ycp?rev=60257&r1=60256&r2=60257&view=diff ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Thu Jan 7 13:46:56 2010 @@ -20,6 +20,7 @@ import "Label"; import "URL"; +import "URLRecode"; import "Popup"; import "CWM"; import "SourceManager"; @@ -57,6 +58,10 @@ */ boolean _allow_https = true; +// CD/DVD device name to use (e.g. /dev/sr1) in case of multiple +// devices in the system. Empty string means use the default. +string cd_device_name = ""; + /** * Help text suffix for some types of the media */ @@ -1854,8 +1859,21 @@ string msg = selected == `cd ? _("Insert the add-on product CD") : _("Insert the add-on product DVD"); - if (! SourceManager::AskForCD (msg)) + + // reset the device name + cd_device_name = ""; + + // ask for a medium + map ui_result = SourceManager::AskForCD (msg); + if (! ui_result["continue"]:false) return false; + + string cd_device = ui_result["device"]:""; + if (cd_device != nil && cd_device != "") + { + y2milestone("Selected CD/DVD device: %1", cd_device); + cd_device_name = cd_device; + } } else if (selected == `usb) { @@ -1905,8 +1923,14 @@ else if ( selected == `https ) _url = "https://"; else if ( selected == `samba ) _url = "smb://"; else if ( selected == `nfs ) _url = "nfs://"; - else if ( selected == `cd ) _url = "cd:///"; - else if ( selected == `dvd ) _url = "dvd:///"; + else if ( selected == `cd || selected == `dvd) + { + _url = (selected == `cd) ? "cd:///" : "dvd:///"; + if (cd_device_name != "") + { + _url = _url + "?devices=" + URLRecode::EscapeQuery(cd_device_name); + } + } else if ( selected == `hd ) _url = "hd://"; else if ( selected == `usb ) _url = "usb://"; else if ( selected == `local_dir ) _url = "dir://"; Modified: trunk/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceManager.ycp?rev=60257&r1=60256&r2=60257&view=diff ============================================================================== --- trunk/packager/src/modules/SourceManager.ycp (original) +++ trunk/packager/src/modules/SourceManager.ycp Thu Jan 7 13:46:56 2010 @@ -729,13 +729,13 @@ /** * */ -global boolean AskForCD (string message) { +global map AskForCD (string message) { list > cdroms = (list >) SCR::Read (.probe.cdrom); boolean multiple_drives = size (cdroms) > 1; term drives_sel = `Empty (); - list<string> devices = maplist (map d, cdroms, { - return d["dev_name"]:""; + list<term> devices = maplist (map d, cdroms, { + return `item(`id(d["dev_name"]:""), d["model"]:"" + " (" + (d["dev_name"]:"") + ")" ); }); if (multiple_drives) { @@ -759,7 +759,7 @@ ), `HSpacing (1)); UI::OpenDialog (contents); if (multiple_drives) - UI::ChangeWidget (`id (`drives), `CurrentItem, devices[0]:""); + UI::ChangeWidget (`id (`drives), `CurrentItem, cdroms[0,"dev_name"]:""); UI::SetFocus (`id (`cont)); symbol ret = nil; while (true) @@ -779,13 +779,22 @@ else { SCR::Execute (.target.bash, sformat ("/bin/eject %1", - devices[0]:"")); + cdroms[0,"dev_name"]:"")); } } ret = nil; } + + map result = $[ "continue" : (ret == `cont) ]; + + if (multiple_drives) + { + result = add(result, "device", (string)UI::QueryWidget (`id (`drives), `Value)); + } + UI::CloseDialog (); - return ret == `cont; + + return result; } /** -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org