[yast-commit] r51881 - in /trunk/sound: VERSION package/yast2-sound.changes sound/src/Sound.ycp sound/src/write_routines.ycp

Author: lslezak Date: Mon Oct 6 17:22:35 2008 New Revision: 51881 URL: http://svn.opensuse.org/viewcvs/yast?rev=51881&view=rev Log: - fixed storing additional module parameters (bnc#404900) (check the key before removal from a map) - 2.17.5 Modified: trunk/sound/VERSION trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/write_routines.ycp Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=51881&r1=51880&r2=51881&view=diff ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Mon Oct 6 17:22:35 2008 @@ -1 +1 @@ -2.17.3 +2.17.5 Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.changes?rev=51881&r1=51880&r2=51881&view=diff ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Mon Oct 6 17:22:35 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 6 17:18:43 CEST 2008 - lslezak@suse.cz + +- fixed storing additional module parameters (bnc#404900) + (check the key before removal from a map) +- 2.17.5 + +------------------------------------------------------------------- Mon Oct 6 15:10:59 CEST 2008 - lslezak@suse.cz - the sound card DB has been updated to kernel-2.6.27-rc7-12 Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=51881&r1=51880&r2=51881&view=diff ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Mon Oct 6 17:22:35 2008 @@ -1129,8 +1129,11 @@ maplist (string modname, (list<string>) mods, ``{ map opts = CollectOptions(modname); - // ignore "index" options - opts = remove(opts, "index"); + if (haskey(opts, "index")) + { + // ignore "index" options + opts = remove(opts, "index"); + } string optstr = ""; maplist(string k, string v, (map) opts, ``{ Modified: trunk/sound/sound/src/write_routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/write_routines.ycp?rev=51881&r1=51880&r2=51881&view=diff ============================================================================== --- trunk/sound/sound/src/write_routines.ycp (original) +++ trunk/sound/sound/src/write_routines.ycp Mon Oct 6 17:22:35 2008 @@ -264,10 +264,17 @@ // remove "index" option, do not write it string index = res["index"]:""; - res = remove(res, "index"); + + if (haskey(res, "index")) + { + res = remove(res, "index"); + } // remove old "enable" option if it's present - res = remove(res, "enable"); + if (haskey(res, "enable")) + { + res = remove(res, "enable"); + } list<string> indices = splitstring(index, ","); @@ -389,6 +396,7 @@ * @return map return struct: $["return": boolean, "err_msg": string] */ define map SaveModulesEntry (list save_info, list system) ``{ + y2milestone("SaveModulesEntry: %1, %2", save_info, system); path mod = .modprobe_sound; path mod_alias = .modprobe_sound.alias; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org