October 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66211 - /branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp
by lslezak＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: lslezak Date: Mon Oct 3 18:25:17 2011 New Revision: 66211 URL: http://svn.opensuse.org/viewcvs/yast?rev=66211&view=rev Log: removed "No joystick" item, joustick is removed using [Delete] button now Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Mon Oct 3 18:25:17 2011 @@ -92,10 +92,6 @@ * @return symbol Id of pressed button in the dialog */ define symbol joy_dialog (integer joy_id, symbol button, map sound_card) ``{ - - // item in joystick types - string nonejoy = _("No joystick"); - if (joy_id == nil) { return `back; @@ -112,19 +108,7 @@ _("In this dialog, specify your joystick type. If your joystick type is not in the list, select Generic Analog Joystick. You will not find any USB joysticks here. If you have a USB device, just plug in the joystick and start using it. -") + - - // help text for joystick configuration 2/4 -_("To remove the configured joystick from the system -or if you do not have a joystick, select No joystick. -") + - - // help text for joystick configuration 3/4 -_("Press Test to test the functionality of the selected joystick type.") + - - // help text for joystick configuration 4/4 -_("Note: Connect your joystick to your computer -before pressing Test or Next."); +"); map joy = Joystick::joystick[joy_id]:$[]; string mod = joy["model"]:""; @@ -137,12 +121,6 @@ mod = Joystick::generic_joystick_translated; } - // set none joystick - if (mod == "") - { - mod = nonejoy; - } - joylist = maplist(string modname, list<string> models, JoystickDB, ``( maplist(string model, models, ``([modname, model])) )); @@ -153,8 +131,6 @@ joylist = prepend (joylist, ["analog", Joystick::generic_joystick_translated]); - joylist = prepend(joylist, ["", nonejoy]); - y2debug("joylist: %1", joylist); integer index = 0; -- 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] r66210 - in /branches/tmp/lslezak/sound/sound/src: joy_dialog.ycp joystick.ycp
by lslezak＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: lslezak Date: Mon Oct 3 18:03:28 2011 New Revision: 66210 URL: http://svn.opensuse.org/viewcvs/yast?rev=66210&view=rev Log: clean up - removed obsoleted code Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp branches/tmp/lslezak/sound/sound/src/joystick.ycp Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Mon Oct 3 18:03:28 2011 @@ -65,326 +65,6 @@ return false; } -/** - * Dialog for joystick testing. - * @param card_id Sound card card_id - * @param joymodidx model id - * @param joymod joystick module - * @return boolean false when Abort was pressed or some problems occurred - */ -define boolean joy_test_popup (integer card_id, integer joymodidx, - string joymod) ``{ - - any ret = nil; - UI::OpenDialog(`opt(`decorated), `HBox(`HSpacing(1.5), - `VBox( - `VSpacing(1), - // Wait text label - `Label(_("Initializing joystick -- please wait...")), - `VSpacing(1), - `PushButton(`id(`done), `opt(`default), Label::AbortButton()), - `VSpacing(1) - ), - `HSpacing(1.5) - )); - - // store old joystick configuration: - list current_conf = (list) eval (Joystick::joystick); - - // if new joystick type was selected: - boolean testing_new = false; - - string modname = Sound::modules_conf [card_id, "module"]:""; - map joy_entry = Sound::GetJoystickSettings(modname); - string model = joylist [joymodidx, 1]:""; - - // do not translate model in /etc/sysconfig/joystick - if (model == Joystick::generic_joystick_translated) - { - model = Joystick::generic_joystick; - } - joy_entry = add(joy_entry, "JOYSTICK_MODULE", joymod); - joy_entry = add(joy_entry, "model", model); - - if (model != current_conf [card_id, "model"]:"") - testing_new = true; - - Joystick::joystick[card_id] = joy_entry; - y2milestone("Tested joystick configuration: %1", joy_entry); - - // unload old and load new modules if necessary: - if (testing_new) - { - Joystick::Stop(); - Joystick::SaveOneJoystick(card_id); - Joystick::WriteConfig(); - Joystick::StartAndEnable(); - } - - // sound card configuration must be changed... - if (update_sound_card_joy_config (card_id, true)) - { - // popup text (yes/no) - if (Popup::YesNo (_("For proper joystick initialization, -a restart of the sound system is necessary. -Proceed?"))) - { - sound_stop (); - sound_start_tmp(true); - } - } - - integer js_id = card_id; // default number of device - list joysticks = []; - integer i = 0; - - sleep (100); - while (i < 4) - { - if (SCR::Execute(.target.bash, - sformat("echo 2>/dev/null < /dev/input/js%1",i)) == 0) - { - joysticks = add (joysticks, i); - y2milestone("existing device: /dev/input/js%1", i); - } - i = i + 1; - } - i = 0; - - if (size (joysticks) == 0) - { - // popup message - Popup::Message(_("No joystick is connected.")); - if (testing_new) - { - Joystick::joystick = current_conf; - Joystick::Stop(); - Joystick::SaveOneJoystick(card_id); - Joystick::WriteConfig(); - Joystick::StartAndEnable(); - } - UI::CloseDialog(); - return false; - } - - if (size (joysticks) > 1) - { - UI::CloseDialog (); - UI::OpenDialog (`opt(`decorated), `HBox(`HSpacing(1.5), `VBox( - `VSpacing(1), - // text label - `Label(_("More than one joystick is connected. -Select the one to test -and press some of its buttons several times. -")), - `VSpacing(1), - `PushButton(`id(`abort), `opt(`default), Label::AbortButton()), - `VSpacing(1)), - `HSpacing(1.5) - )); - - // more joysticks are connected: run jstest alternately for all ones, - // until user pushs some button of joystick he want to test - while (ret == nil) - { - ret = UI::PollInput(); - js_id = joysticks [i]:0; - - SCR::Execute (.background.run_output, - sformat("/usr/bin/jstest --event /dev/input/js%1", js_id)); - sleep (500); - - if ((boolean) SCR::Read(.background.output_open) && - (integer) SCR::Read(.background.newlines)>0) - { - list test_output = (list)SCR::Read(.background.newout); - string last_output = test_output [size (test_output)-1]:""; - last_output = deletechars (last_output, ","); - list listed_output = splitstring (last_output," "); - integer event_type = tointeger (listed_output[2]:"0"); - integer value = tointeger (listed_output [8]:"0"); - if (event_type == 1) - { - y2debug ("output from /dev/js%1: %2", js_id, listed_output); - ret = `found; - } - } - SCR::Execute(.background.kill); - if (ret != `found) - { - if (i == size (joysticks)) - i = 0; - else - i = i + 1; - } - } - } - if (ret == `abort) - { - y2debug ("Abort pressed"); - if (testing_new) - { - Joystick::joystick = current_conf; - Joystick::Stop(); - Joystick::SaveOneJoystick(card_id); - Joystick::WriteConfig(); - Joystick::StartAndEnable(); - } - UI::CloseDialog(); - return false; - } - - // number of device could be different from card number... - js_id = joysticks [i]:0; - SCR::Execute(.background.run_output, - sformat("/usr/bin/jstest --event /dev/input/js%1",js_id)); - - // read the output of joystick initialization - while ((boolean)SCR::Read(.background.output_open) && - (integer)SCR::Read(.background.newlines) == 0) - { - ret = UI::PollInput(); - if (ret != nil) - { - SCR::Execute(.background.kill); - if (testing_new) - { - Joystick::joystick = current_conf; - Joystick::Stop(); - Joystick::SaveOneJoystick(card_id); - Joystick::WriteConfig(); - Joystick::StartAndEnable(); - } - UI::CloseDialog(); - return false; - } - } - // get the number of axes and buttons from the initial jstest output line - list test_output = (list)SCR::Read(.background.newout); - string last_output = test_output[0]:""; - list<string> listed_output = splitstring (last_output," "); - integer axes = 2; - integer buttons = 2; - i = 0; - - while (i < size(listed_output)) - { - // all text parts ("has") depend on output of jstest! - if (listed_output[i]:"" == "has" && listed_output[i+2]:"" == "axes" ) - axes = tointeger (listed_output[i+1]:"2"); - - if (listed_output[i]:"" == "and" && listed_output[i+2]:"" == "buttons.") - buttons = tointeger (listed_output[i+1]:"2"); - i = i + 1; - } - - // generate appropriate dialog for the joystick - term joy_attrib = `VBox(); - string widget_name = ""; - string widget_id = ""; - integer min = -32767; // see js_event.value in linux/joystick.h - integer max = 32767; - i = 0; - - while (i < axes) - { - // progress bar label - widget_name = sformat(_("Axis %1"), i); - widget_id = sformat("Axis %1", i); - joy_attrib = add (joy_attrib, `ProgressBar(`id(widget_id), - `opt(`autoShortcut), widget_name, 2*max, max)); - joy_attrib = add (joy_attrib, `VSpacing(1)); - i = i + 1; - } - - i = 0; - term joy_buttons = `HBox(); - string not_pressed = " "; - string pressed = UI::Glyph(`CheckMark); - while (i < buttons) - { - // label - widget_name = sformat(_("Button %1"), i); - widget_id = sformat ("Button %1", i); - joy_buttons = add (joy_buttons, - `Label (`id(widget_id), widget_name + " " + not_pressed)); - joy_buttons = add (joy_buttons, `HSpacing(2)); - i = i + 1; - } - joy_attrib = add (joy_attrib, joy_buttons); - - UI::CloseDialog(); - UI::OpenDialog(`opt(`decorated), `HBox(`HSpacing(1.5), - `VSpacing(18), - `VBox( - `HSpacing(50), - `VSpacing(1), - // Popup label - `Label(_("Joystick Test")), - `VSpacing(1), - joy_attrib, - `VSpacing(1), - `PushButton(`id(`done), `opt(`default), Label::OKButton()), - `VSpacing(1) - ), - `HSpacing(1.5) - )); - - // read the jstest output until "OK" button is pushed - do - { - if ((boolean)SCR::Read(.background.output_open) && - (integer)SCR::Read(.background.newlines)>0) - { - // read the output line from jstest: - test_output = (list)SCR::Read(.background.newout); - // select the last item of the list: - last_output = test_output [ size(test_output) - 1 ]:""; - last_output = deletechars (last_output, ","); - - listed_output = splitstring (last_output," "); - listed_output = filter (string l, listed_output, ``(l != "")); - - // positions in list depend on jstest output! - integer type = tointeger (listed_output[2]:"0"); - integer number = tointeger (listed_output[6]:"0"); - integer val = tointeger (listed_output[8]:"0"); - - if (type == 1) - { - // button pressed - if (val == 1) - UI::ChangeWidget(`id(sformat("Button %1", number)), `Value, - // label text ("Button" is joystick's button no. %1) - sformat(_("Button %1"), number) + " " + pressed); - else - UI::ChangeWidget(`id(sformat("Button %1", number)), `Value, - sformat(_("Button %1"), number) + " " + not_pressed); - } - else if (type == 2) - { - // change in some axis - UI::ChangeWidget(`id(sformat ("Axis %1", number)), `Value, max + val) ; - } - } - ret = UI::PollInput(); - } - while (ret == nil); - - SCR::Execute(.background.kill); - - // back to the old values - Joystick::joystick = current_conf; - if (testing_new) - { - Joystick::Stop(); - Joystick::SaveOneJoystick(card_id); - Joystick::WriteConfig(); - Joystick::StartAndEnable(); - } - UI::CloseDialog(); - return true; -} integer find_sound_card_id(map sound_card) { @@ -595,7 +275,7 @@ list<map<string,any> > content = []; foreach(map js, Joystick::Detected(), { - y2milestone("Addind joystick: %1", js); + y2milestone("Adding joystick to table: %1", js); string device = js["dev_name2"]:""; string model = js["model"]:""; list<string> descr = []; @@ -812,7 +492,7 @@ ), tcont ), - `Label("To add an USB joystick close this dialog and just connect it."), + `Label(_("To add an USB joystick close this dialog and just connect it.")), `ButtonBox( // button label `PushButton(`id(`ok), _("&Configure joystick")), Modified: branches/tmp/lslezak/sound/sound/src/joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joystick.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joystick.ycp Mon Oct 3 18:03:28 2011 @@ -33,12 +33,6 @@ include "sound/joy_dialog.ycp"; include "sound/write_routines.ycp"; - // selected soundcard id - integer selected_card = nil; - - // label for `next button in joystick configuration dialog - symbol label = `next; - // abort block for read/write dialogs block<boolean> abort_block = ``{ return false; }; @@ -53,135 +47,11 @@ } /** - * First cofiguration dialog - if more than one sound card which support - * joystick is found display them, if there is exactly one card skip to - * joystick selection, if no card was found ask user to start - * sound configuration module. + * Display joystick configuration - the main dialog * @return symbol Symbol of pressed button */ define symbol joystick_configuration() ``{ - return joystick_overview(); - - // helptext - string helptext = _("Two or more sound cards in your system support joysticks. -To configure a joystick, select the sound card and press Configure Joystick. -"); - - if (label == `ok) - { - // one joystick already configured - end - return `next; - } - - // get list of installed sound cards - list cards = Sound::GetSoundCardList(); - - // cards which support joysticks - list filtered = Sound::GetSoundCardListWithJoy(); - - y2milestone("Configured sound cards: %1", cards); - y2milestone("Cards with joystick support: %1", filtered); - - if (Mode::test() == true) - { - cards = [ - $["card_no":0, "name":"VIA 82C686A/B"], - $["card_no":1, "name":"Sound Blaster Live!"]]; - filtered = [ - $["card_no":0, "name":"VIA 82C686A/B"], - $["card_no":1, "name":"Sound Blaster Live!"]]; - } - if (size(filtered) == 1) // one sound card - { - selected_card = filtered[0, "card_no"]:0; - label = `ok; - - // skip to configuration dialog if exactly one card was found - return `config; - } - else if (size(filtered) == 0) // no sound card - { - // dialog label - Wizard::SetContents(_("Joystick Configuration"), `Empty(), "", - false, false); - - string message = (size(cards) > 0) ? - // popup message text - _("The configured cards do not support the joystick.") : - // popup message text - _("No configured sound card was found."); - - // yesno popup message text - message = message + "\n" + _("Start sound card configuration?"); - - if (Popup::YesNoHeadline( - // popup message headline - _("No joystick port to configure was found."), message)) - { - // start sound module - joystick can be configured there - // so after sound config abort this module - WFM::CallFunction("sound", []); - } - return `abort; - } - else // more sound cards - { - list tcont = maplist (map card, (list<map>) filtered, ``{ - map jconf = Joystick::joystick[ card["card_no"]:0 ]:$[]; - string jmodel = jconf["model"]:""; - - // translate generic joystick - if (jmodel == Joystick::generic_joystick) - jmodel = Joystick::generic_joystick_translated; - - return `item( - `id(card["card_no"]:0), - sformat("%1", card["card_no"]:0), - card["name"]:"Sound card", - jmodel - ); - }); - - term dialog = `VBox( - `Table(`id(`cards), `header( - // table header (number) - _("No."), - // table header (card name) - _("Sound card"), - // table header (joystick type) - _("Joystick")), tcont - ), - // button label - `PushButton(`id(`config), _("&Configure joystick")) - ); - - Wizard::SetContents( - // dialog caption - _("Configured Sound Cards with Joystick Support"), - dialog, helptext, true, true); - - Wizard::SetNextButton(`next, Label::NextButton() ); - - // preselect first card - UI::ChangeWidget (`id(`cards),`CurrentItem,filtered[0,"card_no"]:0); - } - symbol ret = nil; - - do - { - ret = (symbol) UI::UserInput(); - } - while (ret != `next && ret != `abort && ret != `back && - ret != `cancel && ret != `config); - - if (ret == `cancel) - { - ret = `abort; - } - selected_card = (integer) UI::QueryWidget(`id(`cards), `CurrentItem); - - return ret; } /** -- 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] r66209 - in /branches/tmp/lslezak/sound/sound/src: Joystick.ycp joy_dialog.ycp joystick.ycp volume.ycp
by lslezak＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: lslezak Date: Mon Oct 3 17:51:13 2011 New Revision: 66209 URL: http://svn.opensuse.org/viewcvs/yast?rev=66209&view=rev Log: joystick - store the sound card to which it is connected, reload drivers and refresh the table after changes, connect detected and configured joysticks Modified: branches/tmp/lslezak/sound/sound/src/Joystick.ycp branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp branches/tmp/lslezak/sound/sound/src/joystick.ycp branches/tmp/lslezak/sound/sound/src/volume.ycp Modified: branches/tmp/lslezak/sound/sound/src/Joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/J… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/Joystick.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/Joystick.ycp Mon Oct 3 17:51:13 2011 @@ -46,6 +46,11 @@ return detected_joysticks; } + global void Detect() + { + detected_joysticks = (list<map>)SCR::Read(.probe.joystick); + } + /** * Get list of all required joystick kernel modules * @return list list of modules @@ -77,6 +82,26 @@ return ret; } + string format_model_line(string model, string attached_to) + { + return sformat("# Model: %1, Attached to: %2\n", model, attached_to); + } + + list<string> parse_model_line(string line) + { + string regexp = "^#[ \t]*Model: (.*),[ \t]*Attached to:[ \t]*(.*)$"; + + string model = regexpsub(line, regexp, "\\1"); + string attached_to = regexpsub(line, regexp, "\\2"); + + if (model == nil) model = ""; + if (attached_to == nil) attached_to = ""; + + y2milestone("Parsed model line: %1 -> model: %2, attached_to: %3", line, model, attached_to); + + return [model, attached_to]; + } + /** * Read all joystick settings from the SCR * @param abort A block that can be called by Read to find @@ -114,6 +139,7 @@ // read model comment string model = (string) SCR::Read(topath( sformat(".sysconfig.joystick.JOYSTICK_MODULE_%1.comment",pos))); + string attached_to = ""; y2debug("Read model comment: %1", model); @@ -151,28 +177,14 @@ } else { - // remove comment char - if (substring(model, 0, 1) == "#") - { - if (size(model) > 1) - { - model = substring(model, 1); - } - else - { - model = ""; - } - } + list<string> info = parse_model_line(model); - // remove new line char - if (size(model) > 1 && - substring(model, size(model) - 1, 1) == "\n") - { - model = substring(model, 0, size(model) - 1); - } + model = info[0]:""; + attached_to = info[1]:""; } - j = add(j, "model", model); + j["model"] = model; + j["attached_to"] = attached_to; joystick = add(joystick, j); @@ -181,7 +193,7 @@ joystick_backup = joystick; - detected_joysticks = (list<map>)SCR::Read(.probe.joystick); + Detect(); return true; } @@ -224,13 +236,14 @@ // write model comment string model = j["model"]:""; + string attached_to = j["attached_to"]:""; // add comment before first model if (pos == 0) { if (size(model) > 0) { - model = module_comment + "\n#" + model + "\n"; + model = module_comment + "\n" + format_model_line(model, attached_to); } else { @@ -241,7 +254,7 @@ { if (size(model) > 0) { - model = "#" + model + "\n"; + model = format_model_line(model, attached_to); } } Modified: branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joy_dialog.ycp Mon Oct 3 17:51:13 2011 @@ -25,6 +25,7 @@ include "sound/joysticks.ycp"; include "sound/ui.ycp"; include "sound/volume_routines.ycp"; + include "sound/routines.ycp"; list joylist = []; @@ -385,35 +386,46 @@ return true; } + integer find_sound_card_id(map sound_card) + { + integer i = 0; + integer ret = nil; + + foreach(map card, Sound::modules_conf, { + if (card["unique_key"]:"" == sound_card["unique_key"]:"") + { + ret = i; + } + + i = i + 1; + }); + + return ret; + } + /** * Joystick configuration dialog. * Configuration of joystick attached to specified sound card. - * @param card_id Sound card card_id + * @param joy_id Joystick index (in the sysconfig file) * @param button Label for `next button: `finish, `ok or `next * @return symbol Id of pressed button in the dialog */ - define symbol joy_dialog (integer card_id, symbol button) ``{ + define symbol joy_dialog (integer joy_id, symbol button, map sound_card) ``{ // item in joystick types string nonejoy = _("No joystick"); - if (card_id == nil) + if (joy_id == nil) { return `back; } - list jcards = Sound::GetSoundCardListWithJoy(); - // find card name - string cardname = ""; - foreach (map<string,any> card, (list<map<string,any> >)jcards, ``{ - if (card["card_no"]:-1 == card_id) - cardname = card["name"]:""; - }); + string cardname = sound_card["model"]:""; - // dialog header - %1: card name (e.g "Soundblaster 16"), %2: card ID (a number) - string caption = sformat(_("Joystick Configuration - %1 (snd-card-%2)"), cardname, card_id); + // dialog header - %1: card name (e.g "Soundblaster 16") + string caption = sformat(_("Joystick Configuration - %1"), cardname); string helptext = // help text for joystick configuration 1/4 @@ -434,10 +446,10 @@ _("Note: Connect your joystick to your computer before pressing Test or Next."); - map joy = Joystick::joystick[card_id]:$[]; + map joy = Joystick::joystick[joy_id]:$[]; string mod = joy["model"]:""; - y2milestone("Joystick configuration of snd-card-%1 started", card_id); + y2milestone("Joystick configuration started, index: %1", joy_id); // translate model from /etc/sysconfig/joystick if (mod == Joystick::generic_joystick) @@ -531,6 +543,7 @@ if (s == `next) { + integer card_id = find_sound_card_id(sound_card); string modname = Sound::modules_conf[card_id, "module"]:""; map joy_entry = Sound::GetJoystickSettings (modname); integer joymodidx = (integer)UI::QueryWidget(`id(`os),`CurrentItem); @@ -553,13 +566,13 @@ y2debug("selected joy module: %1, model: %2", joymod, model); - joy_entry = add (joy_entry, "JOYSTICK_MODULE", joymod); - joy_entry = add (joy_entry, "model", model); - + joy_entry["JOYSTICK_MODULE"] = joymod; + joy_entry["model"] = model; + joy_entry["attached_to"] = sound_card["unique_key"]:""; } update_sound_card_joy_config (card_id, joymod != ""); - Joystick::joystick[card_id] = joy_entry; + Joystick::joystick[joy_id] = joy_entry; Joystick::modified = true; y2milestone("New joystick configuration: %1", joy_entry); @@ -602,20 +615,33 @@ if (bus == "Gameport" && size(js["parent_unique_key"]:"") > 0) { list<map> soundcards = (list<map>)SCR::Read(.probe.sound); - string unique_id = js["parent_unique_key"]:""; + string unique_key = js["parent_unique_key"]:""; - map card = find(map c, soundcards, {return c["unique_key"]:"" == unique_id;}); + map card = find(map c, soundcards, {return c["unique_key"]:"" == unique_key;}); if (card != nil) { // joystick details, %1 is the sound card name to which is the joystick connected bus = sformat("%1 (%2)", bus, card["model"]:""); } + + map j_config = find(map j, (list<map>)Joystick::joystick, {return j["attached_to"]:"" == unique_key;}); + if (j_config != nil) + { + string config_model = j_config["model"]:""; + + if (config_model != nil && config_model != "") + { + y2milestone("Adding joystick model: %1", config_model); + + model = sformat("%1 (%2)", model, config_model); + } + } } map<string,any> j = $[ "id" : device, - "table_descr" : [ js["model"]:"", device, bus ], + "table_descr" : [ model, device, bus ], "rich_descr" : WizardHW::CreateRichTextDescription(model, descr) ]; @@ -758,66 +784,61 @@ list unconfigured_sound_cards(list gameport_cards) { list ret = filter(map card, (list<map>) gameport_cards, { - return Joystick::joystick[ card["card_no"]:0, "model" ]:"" == ""; + return find(map j, (list<map>)Joystick::joystick, {return j["attached_to"]:"" == card["unique_key"]:"";}) == nil; }); y2milestone("Unconfigured gameport cards: %1", ret); return ret; } - integer select_sound_card(list gameport_cards) + map select_sound_card(list gameport_cards) { + integer i = -1; list tcont = maplist (map card, (list<map>) gameport_cards, { - map jconf = Joystick::joystick[ card["card_no"]:0 ]:$[]; - string jmodel = jconf["model"]:""; - - // translate generic joystick - if (jmodel == Joystick::generic_joystick) - jmodel = Joystick::generic_joystick_translated; - + i = i + 1; return `item( - `id(card["card_no"]:0), - sformat("%1", card["card_no"]:0), - card["name"]:"Sound card", - jmodel + `id(i), + card["model"]:"Sound card" ); }); - term dialog = `VBox( - `Heading(_("Configured Sound Cards with Joystick Support")), - `Table(`id(`cards), `header( - // table header (number) - _("No."), - // table header (card name) - _("Sound card"), - // table header (joystick type) - _("Joystick")), tcont - ), - `Label("To add an USB joystick close this dialog and just connect it."), - `ButtonBox( - // button label - `PushButton(`id(`ok), _("&Configure joystick")), - `PushButton(`id(`cancel), Label::CancelButton()) + term dialog = `HBox( + `VSpacing(10), + `VBox( + `Heading(_("Sound Cards with Joystick Support")), + `Table(`id(`cards), `header( + // table header (card name) + _("Sound card") + ), + tcont + ), + `Label("To add an USB joystick close this dialog and just connect it."), + `ButtonBox( + // button label + `PushButton(`id(`ok), _("&Configure joystick")), + `PushButton(`id(`cancel), Label::CancelButton()) + ) ) ); UI::OpenDialog(`opt(`decorated), dialog); - // preselect first card - UI::ChangeWidget (`id(`cards), `CurrentItem, gameport_cards[0,"card_no"]:0); + // preselect the first card + UI::ChangeWidget(`id(`cards), `CurrentItem, 0); symbol ret = (symbol) UI::UserInput(); - y2internal("UI: %1", ret); + + integer joy_card = (integer) UI::QueryWidget(`id(`cards), `CurrentItem); + y2milestone("Selected sound card: %1", joy_card); + + UI::CloseDialog(); if (ret == `cancel || ret == `abort) { y2milestone("Sound card selection canceled"); return nil; } - integer joy_card = (integer) UI::QueryWidget(`id(`cards), `CurrentItem); - y2milestone("Selected sound card: %1", joy_card); - - return joy_card; + return gameport_cards[joy_card]:$[]; } boolean is_usb(string device) @@ -828,6 +849,92 @@ return js["bus"]:"" == "USB"; } + integer find_joystick_number(string parent_id) + { + integer i = 0; + boolean found = false; + + foreach(map j, (list<map>)Joystick::joystick, { + if (j["attached_to"]:"" == parent_id) + { + found = true; + break; + } + i = i + 1; + }); + + integer ret = i; + + if (!found) + { + ret = nil; + } + y2milestone("Joystick index with parent id %1: %2", parent_id, ret); + + return ret; + } + + integer find_free_number() + { + integer i = 0; + boolean found = false; + + foreach(map j, (list<map>)Joystick::joystick, { + if (j["JOYSTICK_MODULE"]:"" == "") + { + found = true; + break; + } + i = i + 1; + }); + + integer ret = i; + + if (!found) + { + ret = nil; + } + y2milestone("Unconfigured joystick at index: %1", ret); + + return ret; + } + + define void restart_joystick(integer num) + { + // restart joystick service to reload the driver + Joystick::Stop(); + Joystick::SaveOneJoystick(num); + Joystick::WriteConfig(); + Joystick::StartAndEnable(); + + // re-detect attached joysticks + Joystick::Detect(); + } + + define void refresh_table() + { + list<map<string,any> > items = joystick_table(); + WizardHW::SetContents(items); + } + + list<map> sound_cards_with_joystick() + { + list<map> sound_cards = (list<map>)SCR::Read(.probe.sound); + + sound_cards = filter(map sound_card, sound_cards, { + string driver = get_module(sound_card)["name"]:""; + + if (driver == nil || driver == "") + { + driver = String::Replace(sound_card["driver_module"]:"", "_", "-"); + } + + return Sound::db_modules[driver, "joystick"]:$[] != $[]; + }); + + return sound_cards; + } + define symbol joystick_overview() { list<list> extra_buttons = [ @@ -857,11 +964,14 @@ y2milestone("WaitForEvent: %1", ev); ret = (symbol)ev["event","ID"]:nil; + + if (ret == `cancel) ret = `abort; + string device = WizardHW::SelectedItem(); if (ret == `add) { - list jcards = Sound::GetSoundCardListWithJoy(); + list<map> jcards = sound_cards_with_joystick(); y2milestone("Sound cards with gameport: %1", jcards); // no sound card with gameport @@ -888,12 +998,17 @@ else { // if there is just one card just use it otherwise ask user - integer selected = (size(unconfigured) == 1) ? unconfigured[0, "card_no"]:0 : select_sound_card(unconfigured); + map card = (size(unconfigured) == 1) ? unconfigured[0]:$[] : select_sound_card(unconfigured); + integer joy_index = find_free_number(); // selection canceled? - if (selected != nil) + if (card != nil) { - joy_dialog(selected, `ok); + joy_dialog(joy_index, `ok, card); + + restart_joystick(joy_index); + + refresh_table(); } } } @@ -907,6 +1022,21 @@ } else { + string uid = find_joystick(device)["parent_unique_key"]:""; + integer num = find_joystick_number(uid); + list<map> soundcards = (list<map>)SCR::Read(.probe.sound); + map card = find(map c, soundcards, {return c["unique_key"]:"" == uid;}); + + symbol ui = joy_dialog(num, `ok, card); + + if (ui == `next || ui == `finish) + { + // restart joystick service to reload the driver + restart_joystick(num); + + // refresh table content + refresh_table(); + } } } else if (ret == `delete) @@ -918,6 +1048,18 @@ } else { + integer num = find_joystick_number(find_joystick(device)["parent_unique_key"]:""); + y2milestone("Deleting joystick %1 (index %2)", device, num); + + // modify joystick config + Joystick::joystick[num] = $[]; + Joystick::modified = true; + + // restart joystick service to reload the driver + restart_joystick(num); + + // refresh table content + refresh_table(); } } else if (ret == `test) @@ -926,7 +1068,9 @@ } } + y2milestone("Final joystick config: %1", Joystick::joystick); y2milestone("Joystick overview result: %1", ret); + return ret; } Modified: branches/tmp/lslezak/sound/sound/src/joystick.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/j… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/joystick.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/joystick.ycp Mon Oct 3 17:51:13 2011 @@ -211,12 +211,6 @@ "detect" : $[ `next : "save", `abort : `abort, - `config : "joystick" - ], - - "joystick" : $[ - `abort : `abort, - `next : "detect" ], "save" : $[ @@ -227,7 +221,6 @@ // aliases for dialogs map aliases = $[ "detect" : ``(joystick_configuration()), - "joystick" : [ ``(joy_dialog(selected_card, label)), true ], "save" : ``(saveconfig()) ]; Modified: branches/tmp/lslezak/sound/sound/src/volume.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/sound/sound/src/v… ============================================================================== --- branches/tmp/lslezak/sound/sound/src/volume.ycp (original) +++ branches/tmp/lslezak/sound/sound/src/volume.ycp Mon Oct 3 17:51:13 2011 @@ -176,7 +176,7 @@ } else if (ui == `next && Sound::conf_joystick && !Mode::config()) { - symbol ret = joy_dialog(card_id, `next); + symbol ret = nil; //FIXME: joy_dialog(card_id, `next); if (ret == `back) { con = VolumeCon(save_entry, vol); @@ -357,7 +357,7 @@ { break; } - symbol s = joy_dialog (card_id, `next); + symbol s = nil; // FIXME: joy_dialog (card_id, `next); if (s == `abort || s == `cancel) { ui = `abort; @@ -396,7 +396,7 @@ if (Sound::conf_joystick == true && Sound::use_ui) { - joy_dialog(card_id, `next); + // FIXME: joy_dialog(card_id, `next); } ui = `next; } -- 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] r66208 - in /trunk/ruby-bindings: VERSION.cmake package/yast2-ruby-bindings.changes
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:44 2011 New Revision: 66208 URL: http://svn.opensuse.org/viewcvs/yast?rev=66208&view=rev Log: Releasing version 0.3.8. Modified: trunk/ruby-bindings/VERSION.cmake trunk/ruby-bindings/package/yast2-ruby-bindings.changes Modified: trunk/ruby-bindings/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/VERSION.cmake?rev=… ============================================================================== --- trunk/ruby-bindings/VERSION.cmake (original) +++ trunk/ruby-bindings/VERSION.cmake Mon Oct 3 17:23:44 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "3") -SET(VERSION_PATCH "7") +SET(VERSION_PATCH "8") Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby… ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Mon Oct 3 17:23:44 2011 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Oct 3 17:18:29 CEST 2011 - mvidner(a)suse.cz + +- WIP: Ruby objects usable from YCP (FATE#312825). + except those that get garbage collected :-/) +- Run the tests at RPM build time. +- Less log clutter when importing a Ruby namespace. +- 0.3.8 + +------------------------------------------------------------------- Tue Jul 26 07:58:02 UTC 2011 - kkaempf(a)novell.com - Re-init the Ruby stack when calling a Ruby function. bnc#708059 -- 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] r66207 - /trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:42 2011 New Revision: 66207 URL: http://svn.opensuse.org/viewcvs/yast?rev=66207&view=rev Log: Don't dereference end(). Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Oct 3 17:23:42 2011 @@ -107,7 +107,10 @@ YRuby::refcount_map_t& vrby = YRuby::yRuby()->value_references_from_ycp; YRuby::refcount_map_t::iterator it = vrby.find(value); - assert(it != vrby.end()); + if (it == vrby.end()) { + // YRuby got re-constructed during final cleanup; do nothing + return; + } int & count = it->second; --count; -- 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] r66206 - /trunk/ruby-bindings/tests/ycp/ruby_object.ycp
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:40 2011 New Revision: 66206 URL: http://svn.opensuse.org/viewcvs/yast?rev=66206&view=rev Log: Test without forcing garbage collection, currently it fails. maybe due to the moving stack start (bnc#708059) Modified: trunk/ruby-bindings/tests/ycp/ruby_object.ycp Modified: trunk/ruby-bindings/tests/ycp/ruby_object.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_obj… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_object.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_object.ycp Mon Oct 3 17:23:40 2011 @@ -10,7 +10,7 @@ // my_uri is an opaque ruby object any my_uri = URI::parse("http://www.ruby-lang.org/"); - URI::garbage_collect(); + // URI::garbage_collect(); string scheme = (string) URI::scheme(my_uri); y2milestone("scheme: %1", scheme); -- 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] r66205 - in /trunk/ruby-bindings/src/ruby: Y2RubyTypeConv.cc YRuby.cc YRuby.h
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:37 2011 New Revision: 66205 URL: http://svn.opensuse.org/viewcvs/yast?rev=66205&view=rev Log: Assist mark+sweep garbage collection by marking values referenced from YCP. Countess Reference marries Mark Sweep. Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc trunk/ruby-bindings/src/ruby/YRuby.cc trunk/ruby-bindings/src/ruby/YRuby.h Modified: trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/Y2RubyTyp… ============================================================================== --- trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc (original) +++ trunk/ruby-bindings/src/ruby/Y2RubyTypeConv.cc Mon Oct 3 17:23:37 2011 @@ -46,6 +46,9 @@ #include <ycp/YCPExternal.h> #include <ycp/Import.h> +#include <cassert> + +#include "YRuby.h" #include "Y2RubyTypePath.h" #include "Y2RubyTypeTerm.h" @@ -98,9 +101,31 @@ #define YCP_EXTERNAL_MAGIC "Ruby object" +static void ycpexternal_finalizer(void * value_v, string /*magic*/) +{ + VALUE value = (VALUE)value_v; + + YRuby::refcount_map_t& vrby = YRuby::yRuby()->value_references_from_ycp; + YRuby::refcount_map_t::iterator it = vrby.find(value); + assert(it != vrby.end()); + + int & count = it->second; + --count; + y2internal("Refcount of value %ld decremented to %d", value, count); + assert(count >= 0); + + if (count == 0) { + vrby.erase(it); + } +} + static YCPExternal rbobject_2_ycpexternal( VALUE value ) { - YCPExternal ex((void*) value, string(YCP_EXTERNAL_MAGIC), NULL); + YCPExternal ex((void*) value, string(YCP_EXTERNAL_MAGIC), ycpexternal_finalizer); + + // defaults to zero, ok + int count = ++YRuby::yRuby()->value_references_from_ycp[value]; + y2internal("Refcount of value %ld incremented to %d", value, count); return ex; } Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Mon Oct 3 17:23:37 2011 @@ -82,6 +82,32 @@ //ruby_options(argc - 1, ++argv); ruby_script("yast"); ruby_init_loadpath(); + + VALUE ycp_references = Data_Wrap_Struct(rb_cObject, gc_mark, gc_free, & value_references_from_ycp); + rb_global_variable(&ycp_references); +} + +void YRuby::gc_mark(void *object) +{ + refcount_map_t * vrby = (refcount_map_t *) object; + + y2internal("mark: map size is %u", vrby->size()); + refcount_map_t::iterator + b = vrby->begin(), + e = vrby->end(), + it; + for (it = b; it != e; ++it) { + y2internal("marking: value %ld refcount %d", it->first, it->second); + rb_gc_mark(it->first); + } +} + +void YRuby::gc_free(void *object) +{ + refcount_map_t * vrby = (refcount_map_t *) object; + + y2internal("free: map size is %u", vrby->size()); + y2internal("should happen quite last or we are in trouble FIXME"); } YRuby::~YRuby() Modified: trunk/ruby-bindings/src/ruby/YRuby.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.h?r… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.h (original) +++ trunk/ruby-bindings/src/ruby/YRuby.h Mon Oct 3 17:23:37 2011 @@ -97,11 +97,23 @@ **/ YCPValue callInner (string module, string function, bool method, YCPList argList, constTypePtr wanted_result_type); + /** + * Ruby VALUEs do not have a reference count like YCP or Perl. + * To protect them from being garbage-collected, they must be marked + * via ruby_gc_mark + * + * A set is not enough: one VALUE can be referenced by multiple + * YCPValueReps + */ + typedef std::map<VALUE, int> refcount_map_t; -protected: - +private: + static void gc_mark(void *object); + static void gc_free(void *object); + public: static YRuby * _yRuby; + refcount_map_t value_references_from_ycp; }; #endif // YRuby_h -- 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] r66204 - in /trunk/ruby-bindings/tests/ycp: URI.rb ruby_object.ycp
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:35 2011 New Revision: 66204 URL: http://svn.opensuse.org/viewcvs/yast?rev=66204&view=rev Log: Force garbage collection to test memory allocation bugs. Modified: trunk/ruby-bindings/tests/ycp/URI.rb trunk/ruby-bindings/tests/ycp/ruby_object.ycp Modified: trunk/ruby-bindings/tests/ycp/URI.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/URI.rb?r… ============================================================================== --- trunk/ruby-bindings/tests/ycp/URI.rb (original) +++ trunk/ruby-bindings/tests/ycp/URI.rb Mon Oct 3 17:23:35 2011 @@ -1,11 +1,13 @@ require 'uri' module URI - # URI::parse works even without glue? - #def self.parse(uri_string) - - #end + # URI::parse works even without glue def self.scheme(instance) instance.scheme end + + # garbage_collect + class << self; + include GC + end end Modified: trunk/ruby-bindings/tests/ycp/ruby_object.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_obj… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_object.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_object.ycp Mon Oct 3 17:23:35 2011 @@ -9,6 +9,9 @@ // my_uri is an opaque ruby object any my_uri = URI::parse("http://www.ruby-lang.org/"); + + URI::garbage_collect(); + string scheme = (string) URI::scheme(my_uri); y2milestone("scheme: %1", scheme); return scheme == "http"; -- 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] r66203 - /trunk/ruby-bindings/tests/ycp/run_ycp_test.sh
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:33 2011 New Revision: 66203 URL: http://svn.opensuse.org/viewcvs/yast?rev=66203&view=rev Log: use PREFIX, optionally use valgrind or strace Modified: trunk/ruby-bindings/tests/ycp/run_ycp_test.sh Modified: trunk/ruby-bindings/tests/ycp/run_ycp_test.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/run_ycp_… ============================================================================== --- trunk/ruby-bindings/tests/ycp/run_ycp_test.sh (original) +++ trunk/ruby-bindings/tests/ycp/run_ycp_test.sh Mon Oct 3 17:23:33 2011 @@ -3,4 +3,7 @@ DIR=${1%/*} # RPM_BUILD_ROOT will hold the YCP Ruby plugin at rpm build time export Y2DIR=$RPM_BUILD_ROOT/usr/lib/YaST2 -/usr/lib/YaST2/bin/y2base -l - -M $DIR $1 UI +# DEBUG=valgrind +# DEBUG="strace -s1000 -o log -e trace=file" +: ${PREFIX=/usr} +$DEBUG $PREFIX/lib/YaST2/bin/y2base -l - -M $DIR $1 UI -- 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] r66202 - /trunk/ruby-bindings/src/ruby/YRubyNamespace.cc
by mvidner＠svn2.opensuse.org 03 Oct '11

03 Oct '11

Author: mvidner Date: Mon Oct 3 17:23:31 2011 New Revision: 66202 URL: http://svn.opensuse.org/viewcvs/yast?rev=66202&view=rev Log: Less log clutter when importing a Ruby namespace. Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRubyName… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRubyNamespace.cc (original) +++ trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Mon Oct 3 17:23:31 2011 @@ -252,8 +252,8 @@ // enter it to the symbol table enterSymbol (fun_se, 0); y2milestone("method: '%s' added", RSTRING(current)->ptr); - y2milestone("%s", symbolsToString().c_str()); } + y2milestone("%s", symbolsToString().c_str()); } YRubyNamespace::~YRubyNamespace () -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0