January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60264 - /trunk/yast2/library/modules/FileUtils.ycp
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 14:27:45 2010 New Revision: 60264 URL: http://svn.opensuse.org/viewcvs/yast?rev=60264&view=rev Log: docu Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Thu Jan 7 14:27:45 2010 @@ -379,6 +379,19 @@ return filemd5; } + /** + * Changes ownership of a file/directory + * + * @return boolean true if succeeded + * @param string user and group name (in the form 'user:group') + * @param string file name + * @param boolean recursive, true if file (2nd param) is a directory + * + * @example + * FileUtils::Chown ( "somebody:somegroup", "/etc/passwd", false) -> 'chown somebody:somegroup /etc/passwd' + * FileUtils::Chown ( "nobody:nogroup", "/tmp", true) -> 'chown nobody:nogroup -R /tmp' + */ + global boolean Chown( string usergroup, string file, boolean recursive) { y2milestone("Setting ownership of file %1 to %2", file, usergroup); @@ -389,10 +402,23 @@ if( retval != 0) y2error("Cannot chown %1", file); - + return (retval == 0); } + /** + * Changes access rights to a file/directory + * + * @return boolean true if succeeded + * @param string modes ( e.g. '744' or 'u+x') + * @param string file name + * @param boolean recursive, true if file (2nd param) is a directory + * + * @example + * FileUtils::Chmod ( "go-rwx", "/etc/passwd", false) -> 'chmod go-rwx /etc/passwd' + * FileUtils::Chmod ( "700", "/tmp", true) -> 'chmod 700 -R /tmp' + */ + global boolean Chmod (string modes, string file, boolean recursive) { y2milestone("Setting access rights of file %1 to %2", file, modes); @@ -434,16 +460,38 @@ return tmpfile; } + /** + * Creates temporary file + * + * @return string resulting file name or nil on failure + * @param string template for file name e.g. 'tmp.XXXX' + * @param string tmp file owner in a form 'user:group' + * @param string tmp file access rights + * + * @example + * FileUtils::MkTempFile ( "/tmp/tmpfile.XXXX", "somebody:somegroup", "744") + */ + global string MkTempFile (string template, string usergroup, string modes) { return MkTempInternal( template, usergroup, modes, false ); } + /** + * The same as MkTempFile, for directories ('mktemp -d ... '). See above + * + * @example + * FileUtils::MkTempDirectory ( "/tmp/tmpdir.XXXX", "nobody:nogroup", "go+x") + */ global string MkTempDirectory (string template, string usergroup, string modes) { return MkTempInternal( template, usergroup, modes, true ); } + /** + * Removes files and dirs created in all previous calls to MkTemp[File|Directory] + * + */ global void CleanupTemp() { foreach (string one_file, tmpfiles, { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60263 - in /trunk/yast2: package/yast2.changes scripts/yast2
by jsrain＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: jsrain Date: Thu Jan 7 14:27:42 2010 New Revision: 60263 URL: http://svn.opensuse.org/viewcvs/yast?rev=60263&view=rev Log: updated start-up script to behave correctly if QT CC is to be used without QT back-end (bnc#545331) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jan 7 14:27:42 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 7 14:26:21 CET 2010 - jsrain(a)suse.cz + +- updated start-up script to behave correctly if QT CC is to be + used without QT back-end (bnc#545331) + +------------------------------------------------------------------- Tue Jan 5 15:07:54 UTC 2010 - lslezak(a)suse.cz - added missing UI::SetProductName() call - display the proper Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=60263&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Thu Jan 7 14:27:42 2010 @@ -183,16 +183,25 @@ if check_gtk; then SELECTED_GUI=gtk else - echo >&2 "GTK GUI wanted but not found, falling back to Qt." - WANTED_GUI=qt + if check_qt; then + SELECTED_GUI=qt + WANTED_GUI=qt + echo >&2 "GTK GUI wanted but not found, falling back to Qt." + else + echo >&2 "GTK GUI wanted but not found, falling back to ncurses." + fi fi - fi - - if [ "$WANTED_GUI" = "qt" ]; then + elif [ "$WANTED_GUI" = "qt" ]; then if check_qt; then SELECTED_GUI=qt else - echo >&2 "Qt GUI wanted but not found, falling back to ncurses." + if check_gtk; then + SELECTED_GUI=gtk + WANTED_GUI=gtk + echo >&2 "Qt GUI wanted but not found, falling back to GTK." + else + echo >&2 "Qt GUI wanted but not found, falling back to ncurses." + fi fi elif [ "$SELECTED_GUI" != "gtk" -a "$WANTED_GUI" != "ncurses" ]; then echo >&2 "Unknown GUI '$WANTED_GUI', falling back to ncurses." -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60262 - /branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am
by mvidner＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: mvidner Date: Thu Jan 7 14:20:15 2010 New Revision: 60262 URL: http://svn.opensuse.org/viewcvs/yast?rev=60262&view=rev Log: Distribute also URLRecode.pm in the tarball (amending r60252) Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/types/src/Makefile.am Thu Jan 7 14:20:15 2010 @@ -1,6 +1,6 @@ # Makefile.am for yast2/library/types/src -module_DATA = $(wildcard *.ycp) +module_DATA = $(wildcard *.ycp) $(wildcard *.pm) EXTRA_DIST = $(module_DATA) include $(top_srcdir)/Makefile.am.common -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60261 - /trunk/yast2/library/modules/FileUtils.ycp
by kmachalkova＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: kmachalkova Date: Thu Jan 7 13:51:19 2010 New Revision: 60261 URL: http://svn.opensuse.org/viewcvs/yast?rev=60261&view=rev Log: New funcs (chmod/own, mktemp) Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Thu Jan 7 13:51:19 2010 @@ -18,6 +18,8 @@ import "Popup"; import "String"; + list <string> tmpfiles = []; + /** * Function which determines if the requested file/directory exists. * @@ -377,5 +379,78 @@ return filemd5; } + global boolean Chown( string usergroup, string file, boolean recursive) + { + y2milestone("Setting ownership of file %1 to %2", file, usergroup); + + string cmd = sformat("chown %1 %2 %3", usergroup, (recursive ? "-R" : "" ), file); + + integer retval = (integer) SCR::Execute(.target.bash, cmd); + + if( retval != 0) + y2error("Cannot chown %1", file); + + return (retval == 0); + } + + global boolean Chmod (string modes, string file, boolean recursive) + { + y2milestone("Setting access rights of file %1 to %2", file, modes); + + string cmd = sformat("chmod %1 %2 %3", modes, (recursive ? "-R" : "" ), file); + + integer retval = (integer) SCR::Execute(.target.bash, cmd); + + if( retval != 0) + y2error("Cannot chmod %1", file); + + return (retval == 0); + + } + + string MkTempInternal (string template, string usergroup, string modes, boolean directory) + { + string mktemp = sformat("/bin/mktemp %1 %2", + (directory ? "-d" : ""), template); + + map cmd_out = (map) SCR::Execute (.target.bash_output, mktemp); + if (cmd_out["exit"]:-1 != 0) { + y2error ("Error creating temporary file: %1", cmd_out); + return nil; + } + + string tmpfile = splitstring (cmd_out["stdout"]:"", "\n")[0]:""; + + if (tmpfile == nil || tmpfile == "") { + y2error ("Error creating temporary file: %1 - empty output", cmd_out); + return nil; + } + + if( !Chown( usergroup, tmpfile, directory) || !Chmod( modes, tmpfile, directory)) { + return nil; + } + + tmpfiles = add(tmpfiles, tmpfile); + return tmpfile; + } + + global string MkTempFile (string template, string usergroup, string modes) + { + return MkTempInternal( template, usergroup, modes, false ); + } + + global string MkTempDirectory (string template, string usergroup, string modes) + { + return MkTempInternal( template, usergroup, modes, true ); + } + + global void CleanupTemp() + { + foreach (string one_file, tmpfiles, { + y2milestone("Removing %1", one_file); + SCR::Execute (.target.bash, sformat ("/bin/rm -rf '%1'", one_file)); + }); + } + /* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60260 - /tags/branch-Code-11-SP1-2_17_66/packager/
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:47:48 2010 New Revision: 60260 URL: http://svn.opensuse.org/viewcvs/yast?rev=60260&view=rev Log: Created tag branch-Code-11-SP1-2_17_66 for packager Added: tags/branch-Code-11-SP1-2_17_66/packager/ (props changed) - copied from r60259, branches/SuSE-Code-11-SP1-Branch/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60259 - /tags/branch-Code-11-SP1-2_17_66/
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:47:46 2010 New Revision: 60259 URL: http://svn.opensuse.org/viewcvs/yast?rev=60259&view=rev Log: Created tag branch-Code-11-SP1-2_17_66 Added: tags/branch-Code-11-SP1-2_17_66/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60258 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/modules/SourceDialogs.ycp src/modules/SourceManager.ycp yast2-packager.spec.in
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: lslezak Date: Thu Jan 7 13:47:42 2010 New Revision: 60258 URL: http://svn.opensuse.org/viewcvs/yast?rev=60258&view=rev Log: - pass the selected CD/DVD device to the package manager in case of multiple devices in the system (bnc#567403) - 2.17.66 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Thu Jan 7 13:47:42 2010 @@ -1 +1 @@ -2.17.65 +2.17.66 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Thu Jan 7 13:47:42 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 7 12:16:03 UTC 2010 - lslezak(a)suse.cz + +- pass the selected CD/DVD device to the package manager in case + of multiple devices in the system (bnc#567403) +- 2.17.66 + +------------------------------------------------------------------- Wed Jan 6 17:48:18 UTC 2010 - lslezak(a)suse.cz - do not reselect patterns which have been deselected by user Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceDialogs.ycp Thu Jan 7 13:47:42 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 */ @@ -1797,8 +1802,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<string,any> 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) { @@ -1848,8 +1866,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: branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/modules/SourceManager.ycp Thu Jan 7 13:47:42 2010 @@ -1375,13 +1375,13 @@ /** * */ -global boolean AskForCD (string message) { +global map<string,any> AskForCD (string message) { list<map<string,any> > cdroms = (list<map<string,any> >) SCR::Read (.probe.cdrom); boolean multiple_drives = size (cdroms) > 1; term drives_sel = `Empty (); - list<string> devices = maplist (map<string,any> d, cdroms, { - return d["dev_name"]:""; + list<term> devices = maplist (map<string,any> d, cdroms, { + return `item(`id(d["dev_name"]:""), d["model"]:"" + " (" + (d["dev_name"]:"") + ")" ); }); if (multiple_drives) { @@ -1405,7 +1405,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) @@ -1425,13 +1425,22 @@ else { SCR::Execute (.target.bash, sformat ("/bin/eject %1", - devices[0]:"")); + cdroms[0,"dev_name"]:"")); } } ret = nil; } + + map<string,any> result = $[ "continue" : (ret == `cont) ]; + + if (multiple_drives) + { + result = add(result, "device", (string)UI::QueryWidget (`id (`drives), `Value)); + } + UI::CloseDialog (); - return ret == `cont; + + return result; } /** Modified: branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/yast2-packager.spec.in Thu Jan 7 13:47:42 2010 @@ -7,8 +7,8 @@ # HTTP.ycp BuildRequires: yast2-transfer -# New WorkflowManager -BuildRequires: yast2 >= 2.17.76 +# URLRecode.pm +BuildRequires: yast2 >= 2.17.79 # "keeppackages" repo property BuildRequires: yast2-pkg-bindings >= 2.17.27 @@ -19,8 +19,8 @@ # "keeppackages" repo property Requires: yast2-pkg-bindings >= 2.17.27 -# New WorkflowManager -Requires: yast2 >= 2.17.76 +# URLRecode.pm +Requires: yast2 >= 2.17.79 # unzipping license file Requires: unzip -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60257 - in /trunk/packager: package/yast2-packager.changes src/modules/SourceDialogs.ycp src/modules/SourceManager.ycp
by lslezak＠svn.opensuse.org 07 Jan '10

07 Jan '10

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.… ============================================================================== --- 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(a)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(a)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/SourceDialo… ============================================================================== --- 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<string,any> 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/SourceManag… ============================================================================== --- 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<string,any> AskForCD (string message) { list<map<string,any> > cdroms = (list<map<string,any> >) SCR::Read (.probe.cdrom); boolean multiple_drives = size (cdroms) > 1; term drives_sel = `Empty (); - list<string> devices = maplist (map<string,any> d, cdroms, { - return d["dev_name"]:""; + list<term> devices = maplist (map<string,any> 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<string,any> 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60256 - /tags/branch-Code-11-SP1-2_17_32/autoinstallation/
by ug＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: ug Date: Thu Jan 7 11:47:02 2010 New Revision: 60256 URL: http://svn.opensuse.org/viewcvs/yast?rev=60256&view=rev Log: Created tag branch-Code-11-SP1-2_17_32 for autoinstallation Added: tags/branch-Code-11-SP1-2_17_32/autoinstallation/ (props changed) - copied from r60255, branches/SuSE-Code-11-SP1-Branch/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60255 - in /branches/SuSE-Code-11-SP1-Branch/autoinstallation: VERSION package/autoyast2.changes
by ug＠svn.opensuse.org 07 Jan '10

07 Jan '10

Author: ug Date: Thu Jan 7 11:46:55 2010 New Revision: 60255 URL: http://svn.opensuse.org/viewcvs/yast?rev=60255&view=rev Log: 2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/VERSION Thu Jan 7 11:46:55 2010 @@ -1 +1 @@ -2.17.31 +2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Thu Jan 7 11:46:55 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 7 10:36:45 CET 2010 - ug(a)suse.de + +- 2.17.32 + +------------------------------------------------------------------- Wed Dec 23 14:14:11 CET 2009 - ug(a)suse.de - fix for already mounted USB devices (bnc#565558) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0