February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55185 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:43:27 2009 New Revision: 55185 URL: http://svn.opensuse.org/viewcvs/yast?rev=55185&view=rev Log: - Forcing recreating and redrawing the table of add-on products. - Opening new wizard window before calling inst_rpmcopy and closing after it returns. - Adding more debugging messages (all bnc #471020). - 2.18.2 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=55185&r1=5518… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Mon Feb 2 14:43:27 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Mon Feb 2 14:43:27 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz + +- Forcing recreating and redrawing the table of add-on products. +- Opening new wizard window before calling inst_rpmcopy and closing + after it returns. +- Adding more debugging messages (all bnc #471020). +- 2.18.2 + +------------------------------------------------------------------- Mon Jan 26 16:51:09 CET 2009 - locilka(a)suse.cz - Added new client inst_add-on_software providing the functionality Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Mon Feb 2 14:43:27 2009 @@ -1274,9 +1274,13 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); if (result == `accept) { + Wizard::OpenNextBackDialog(); + y2milestone ("Calling inst_rpmcopy"); WFM::call ("inst_rpmcopy"); y2milestone ("Done"); + + Wizard::CloseDialog(); } return true; @@ -1446,28 +1450,51 @@ while (true) { userret = UI::UserInput(); + // Abort if (userret == `abort || userret == `cancel) { + y2warning ("Aborting..."); ret = `abort; break; + + // Closing } else if (userret == `next || userret == `finish) { + y2milestone ("Finishing..."); ret = `next; break; + + // Addin new product } else if (userret == `add) { + y2milestone ("Using new Add-On..."); + if (RunWizard() == `next) { RunAddProductWorkflow(); } CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); + + // Removing product } else if (userret == `delete) { + y2milestone ("Removing selected product..."); + if (RemoveProductWithDependencies()) { CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); } + + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); + + // Calling packager directly } else if (userret == `packager) { + y2milestone ("Calling packager..."); RunPackageSelector(); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + // Everything else } else { y2error ("Uknown ret: %1", userret); } -- 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] r55184 - in /branches/SuSE-Code-11-Branch/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:43:08 2009 New Revision: 55184 URL: http://svn.opensuse.org/viewcvs/yast?rev=55184&view=rev Log: - Forcing recreating and redrawing the table of add-on products. - Opening new wizard window before calling inst_rpmcopy and closing after it returns. - Adding more debugging messages (all bnc #471020). - 2.17.17 Modified: branches/SuSE-Code-11-Branch/add-on/VERSION branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-Branch/add-on/VERSION Mon Feb 2 14:43:08 2009 @@ -1 +1 @@ -2.17.16 +2.17.17 Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Mon Feb 2 14:43:08 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz + +- Forcing recreating and redrawing the table of add-on products. +- Opening new wizard window before calling inst_rpmcopy and closing + after it returns. +- Adding more debugging messages (all bnc #471020). +- 2.17.17 + +------------------------------------------------------------------- Mon Jan 26 16:51:09 CET 2009 - locilka(a)suse.cz - Added new client inst_add-on_software providing the functionality Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Mon Feb 2 14:43:08 2009 @@ -1274,9 +1274,13 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); if (result == `accept) { + Wizard::OpenNextBackDialog(); + y2milestone ("Calling inst_rpmcopy"); WFM::call ("inst_rpmcopy"); y2milestone ("Done"); + + Wizard::CloseDialog(); } return true; @@ -1446,28 +1450,51 @@ while (true) { userret = UI::UserInput(); + // Abort if (userret == `abort || userret == `cancel) { + y2warning ("Aborting..."); ret = `abort; break; + + // Closing } else if (userret == `next || userret == `finish) { + y2milestone ("Finishing..."); ret = `next; break; + + // Addin new product } else if (userret == `add) { + y2milestone ("Using new Add-On..."); + if (RunWizard() == `next) { RunAddProductWorkflow(); } CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); + + // Removing product } else if (userret == `delete) { + y2milestone ("Removing selected product..."); + if (RemoveProductWithDependencies()) { CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); } + + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); + + // Calling packager directly } else if (userret == `packager) { + y2milestone ("Calling packager..."); RunPackageSelector(); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + // Everything else } else { y2error ("Uknown ret: %1", userret); } -- 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] r55183 - in /trunk/control-center-gnome: ChangeLog src/control-center.c
by vuntz＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: vuntz Date: Mon Feb 2 13:52:44 2009 New Revision: 55183 URL: http://svn.opensuse.org/viewcvs/yast?rev=55183&view=rev Log: 2009-01-31 Vincent Untz <vuntz(a)gnome.org> * src/control-center.c: (main): force not using the default handler for gconf errors. libgnomeui sets one, and when a program is run under "su" (not "su -"), we get gconf errors. And this program is often run under "su", it seems :-) Modified: trunk/control-center-gnome/ChangeLog trunk/control-center-gnome/src/control-center.c Modified: trunk/control-center-gnome/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/ChangeLog?r… ============================================================================== --- trunk/control-center-gnome/ChangeLog (original) +++ trunk/control-center-gnome/ChangeLog Mon Feb 2 13:52:44 2009 @@ -1,3 +1,10 @@ +2009-01-31 Vincent Untz <vuntz(a)gnome.org> + + * src/control-center.c: (main): force not using the default handler for + gconf errors. libgnomeui sets one, and when a program is run under "su" + (not "su -"), we get gconf errors. And this program is often run under + "su", it seems :-) + 2008-05-12 Michael Meeks <michael.meeks(a)novell.com> * Version 2.13.3 Modified: trunk/control-center-gnome/src/control-center.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/src/control… ============================================================================== --- trunk/control-center-gnome/src/control-center.c (original) +++ trunk/control-center-gnome/src/control-center.c Mon Feb 2 13:52:44 2009 @@ -21,6 +21,7 @@ #define ENABLE_NLS 1 #include "config.h" #include <string.h> +#include <gconf/gconf-client.h> #include <gtk/gtkicontheme.h> #include <libgnome/gnome-desktop-item.h> #include <libgnomeui/libgnomeui.h> @@ -114,6 +115,7 @@ AppShellData *app_data; GSList *actions; GnomeProgram *program; + GConfClient *client; const gchar *widget_theming_name = "y2ccg-control-center"; //Fixme - do not hardcode the path - generate and -D it in the Makefile @@ -134,6 +136,17 @@ } } + /* Make gconf not handle the errors by default: libgnomeui installs an + * handler that creates a dialog to display the error. Since this + * application is mainly used as root, and since it can't connect to + * gconf when "su" (not "su -") is used, we will likely get gconf + * errors, and we want to ignore them. + * Also, keep a reference to the default gconf client we created to + * make sure this property kept set. */ + g_type_init (); + client = gconf_client_get_default (); + gconf_client_set_error_handling (client, GCONF_CLIENT_HANDLE_NONE); + startup_id = g_strdup (g_getenv (DESKTOP_STARTUP_ID)); program = gnome_program_init ("YaST2 GNOME Control Center", "0.1", LIBGNOMEUI_MODULE, argc, argv, NULL, NULL); @@ -168,5 +181,7 @@ bonobo_object_unref (bonobo_app); bonobo_debug_shutdown (); g_free (startup_id); + g_object_unref (client); + return 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] r55182 - /tags/branch-Code-11-2_17_51/installation/
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:14:40 2009 New Revision: 55182 URL: http://svn.opensuse.org/viewcvs/yast?rev=55182&view=rev Log: Created tag branch-Code-11-2_17_51 for installation Added: tags/branch-Code-11-2_17_51/installation/ - copied from r55181, branches/SuSE-Code-11-Branch/installation/ -- 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] r55181 - in /branches/SuSE-Code-11-Branch/installation: VERSION package/yast2-installation.changes src/clients/copy_files_finish.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:13:44 2009 New Revision: 55181 URL: http://svn.opensuse.org/viewcvs/yast?rev=55181&view=rev Log: - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). - 2.17.51 Modified: branches/SuSE-Code-11-Branch/installation/VERSION branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-Code-11-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/installation/VERSION Mon Feb 2 13:13:44 2009 @@ -1 +1 @@ -2.17.50 +2.17.51 Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes Mon Feb 2 13:13:44 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 2 13:09:08 CET 2009 - locilka(a)suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). +- 2.17.51 + +------------------------------------------------------------------- Mon Jan 26 13:58:00 CET 2009 - locilka(a)suse.cz - Disabling [Back] buttons in the very first interactive dialogs Modified: branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-Code-11-Branch/installation/src/clients/copy_files_finish.ycp Mon Feb 2 13:13:44 2009 @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); -- 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] r55180 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:13:19 2009 New Revision: 55180 URL: http://svn.opensuse.org/viewcvs/yast?rev=55180&view=rev Log: 2.18.4 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=55180&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Feb 2 13:13:19 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 2 13:13:19 2009 @@ -3,6 +3,7 @@ - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). +- 2.18.4 ------------------------------------------------------------------- Wed Jan 28 14:33:09 CET 2009 - locilka(a)suse.cz -- 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] r55179 - in /trunk/installation: package/yast2-installation.changes src/inst_finish/copy_files_finish.ycp src/modules/InstError.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 13:12:35 2009 New Revision: 55179 URL: http://svn.opensuse.org/viewcvs/yast?rev=55179&view=rev Log: - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/copy_files_finish.ycp trunk/installation/src/modules/InstError.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 2 13:12:35 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 2 13:09:08 CET 2009 - locilka(a)suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). + +------------------------------------------------------------------- Wed Jan 28 14:33:09 CET 2009 - locilka(a)suse.cz - Added new InstError module for unified reporting of errors Modified: trunk/installation/src/inst_finish/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/cop… ============================================================================== --- trunk/installation/src/inst_finish/copy_files_finish.ycp (original) +++ trunk/installation/src/inst_finish/copy_files_finish.ycp Mon Feb 2 13:12:35 2009 @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); Modified: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstErr… ============================================================================== --- trunk/installation/src/modules/InstError.ycp (original) +++ trunk/installation/src/modules/InstError.ycp Mon Feb 2 13:12:35 2009 @@ -55,7 +55,11 @@ ))) ) ), - `ButtonBox (`PushButton (`id(`ok), Label::OKButton())) + `ButtonBox ( + // FIXME: BNC #422612, Use `opt(`noSanityCheck) later + `PushButton (`id(`save_y2logs), `opt(`cancelButton), _("&Save YaST Logs...")), + `PushButton (`id(`ok), Label::OKButton()) + ) )); if (success != true) { -- 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] r55178 - /trunk/audit-laf/package/yast2-audit-laf.changes
by gs＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: gs Date: Mon Feb 2 12:02:55 2009 New Revision: 55178 URL: http://svn.opensuse.org/viewcvs/yast?rev=55178&view=rev Log: Correct behaviour on "Abort" (bnc #458327) Modified: trunk/audit-laf/package/yast2-audit-laf.changes Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Mon Feb 2 12:02:55 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 2 12:01:33 CET 2009 - gs(a)suse.de + +- Correct behaviour on "Abort" (bnc #458327) + +------------------------------------------------------------------- Wed Jan 21 11:51:56 CET 2009 - gs(a)suse.de - Localize message "Success" (bnc #447169) -- 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] r55177 - in /trunk/audit-laf/src: complex.ycp wizards.ycp
by gs＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: gs Date: Mon Feb 2 12:01:20 2009 New Revision: 55177 URL: http://svn.opensuse.org/viewcvs/yast?rev=55177&view=rev Log: correct use of ReallyAbort popup Modified: trunk/audit-laf/src/complex.ycp trunk/audit-laf/src/wizards.ycp Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=55… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Mon Feb 2 12:01:20 2009 @@ -50,16 +50,9 @@ } boolean ReallyAbort() { - return !AuditLaf::Modified() || Popup::ReallyAbort(true); + return Popup::ReallyAbort(AuditLaf::Modified()); } -boolean ReallyExit () { - // yes-no popup - return Popup::YesNo (_("Really exit? -All changes will be lost.")); -} - - /** * Read settings dialog * @return `abort if aborted and `next otherwise Modified: trunk/audit-laf/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/wizards.ycp?rev=55… ============================================================================== --- trunk/audit-laf/src/wizards.ycp (original) +++ trunk/audit-laf/src/wizards.ycp Mon Feb 2 12:01:20 2009 @@ -141,7 +141,7 @@ Wizard::DisableBackButton (); Wizard::SetTitleIcon("yast-audit-laf"); - return CWM::Run (w, $[`abort : ReallyExit]); + return CWM::Run (w, $[`abort : ReallyAbort]); } /** -- 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] r55176 - in /trunk: core/agent-dbus/conf/ core/agent-dbus/src/ storage/storage/src/modules/
by aschnell＠svn.opensuse.org 01 Feb '09

01 Feb '09

Author: aschnell Date: Sun Feb 1 20:51:49 2009 New Revision: 55176 URL: http://svn.opensuse.org/viewcvs/yast?rev=55176&view=rev Log: - make dbus session bus also available Added: trunk/core/agent-dbus/conf/dbus.session.scr trunk/core/agent-dbus/conf/dbus.system.scr (contents, props changed) - copied, changed from r55173, trunk/core/agent-dbus/conf/dbus.scr Removed: trunk/core/agent-dbus/conf/dbus.scr Modified: trunk/core/agent-dbus/conf/Makefile.am trunk/core/agent-dbus/src/DbusAgent.cc trunk/core/agent-dbus/src/DbusAgent.h trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/core/agent-dbus/conf/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/Makefile.am… ============================================================================== --- trunk/core/agent-dbus/conf/Makefile.am (original) +++ trunk/core/agent-dbus/conf/Makefile.am Sun Feb 1 20:51:49 2009 @@ -2,6 +2,6 @@ # Makefile.am for core/agent-dbus/conf # -scrconf_DATA = dbus.scr +scrconf_DATA = dbus.system.scr dbus.session.scr EXTRA_DIST = $(scrconf_DATA) Added: trunk/core/agent-dbus/conf/dbus.session.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/dbus.sessio… ============================================================================== --- trunk/core/agent-dbus/conf/dbus.session.scr (added) +++ trunk/core/agent-dbus/conf/dbus.session.scr Sun Feb 1 20:51:49 2009 @@ -0,0 +1,11 @@ +/** + * File: + * dbus.session.scr + * Authors: + * Arvin Schnell <aschnell(a)suse.de> + */ +.dbus.session + +`ag_dbus( + `Bus("session") +) Copied: trunk/core/agent-dbus/conf/dbus.system.scr (from r55173, trunk/core/agent-dbus/conf/dbus.scr) URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/dbus.system… ============================================================================== --- trunk/core/agent-dbus/conf/dbus.scr (original) +++ trunk/core/agent-dbus/conf/dbus.system.scr Sun Feb 1 20:51:49 2009 @@ -1,9 +1,11 @@ /** * File: - * dbus.scr + * dbus.system.scr * Authors: * Arvin Schnell <aschnell(a)suse.de> */ -.dbus +.dbus.system -`ag_dbus() +`ag_dbus( + `Bus("system") +) Modified: trunk/core/agent-dbus/src/DbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/DbusAgent.cc… ============================================================================== --- trunk/core/agent-dbus/src/DbusAgent.cc (original) +++ trunk/core/agent-dbus/src/DbusAgent.cc Sun Feb 1 20:51:49 2009 @@ -13,22 +13,9 @@ DbusAgent::DbusAgent() + : connection(NULL) { - y2milestone("connecting dbus"); - dbus_error_init(&error); - - connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (dbus_error_is_set(&error)) - { - y2error("dbus_bus_get failed (%s)\n", error.message); - dbus_error_free(&error); - } - - if (connection == NULL) - { - y2error("connecting dbus failed"); - } } @@ -185,3 +172,49 @@ return YCPError(string("Undefined subpath for Execute(") + path->toString() + ")"); } + + +YCPValue +DbusAgent::otherCommand(const YCPTerm& term) +{ + string sym = term->name(); + + if (sym == "Bus") + { + if (term->size() != 1 || !term->value(0)->isString()) + { + return YCPError("Bad number of arguments. Expecting Bus (\"type\")"); + } + + string bus = term->value(0)->asString()->value(); + if (bus == "system") + connect(DBUS_BUS_SYSTEM); + else if (bus == "session") + connect(DBUS_BUS_SESSION); + else + return YCPError("Unknown bus"); + + return YCPBoolean(true); + } + + return YCPNull(); +} + + +void +DbusAgent::connect(DBusBusType type) +{ + y2milestone("connecting dbus"); + + connection = dbus_bus_get(type, &error); + if (dbus_error_is_set(&error)) + { + y2error("dbus_bus_get() failed (%s)", error.message); + dbus_error_free(&error); + } + + if (connection == NULL) + { + y2error("connecting dbus failed"); + } +} Modified: trunk/core/agent-dbus/src/DbusAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/DbusAgent.h?… ============================================================================== --- trunk/core/agent-dbus/src/DbusAgent.h (original) +++ trunk/core/agent-dbus/src/DbusAgent.h Sun Feb 1 20:51:49 2009 @@ -52,8 +52,15 @@ */ virtual YCPList Dir(const YCPPath& path) { return YCPList(); } + /** + * Used for mounting the agent. + */ + virtual YCPValue otherCommand(const YCPTerm& term); + private: + void connect(DBusBusType type); + DBusConnection* connection; DBusError error; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Sun Feb 1 20:51:49 2009 @@ -6383,7 +6383,7 @@ if (!on) { - SCR::Execute(.dbus.method, + SCR::Execute(.dbus.system.method, $[ `destination : "org.freedesktop.Hal", `path : "/org/freedesktop/Hal/Manager", `interface : "org.freedesktop.Hal.Manager", @@ -6393,7 +6393,7 @@ } else { - SCR::Execute(.dbus.method, + SCR::Execute(.dbus.system.method, $[ `destination : "org.freedesktop.Hal", `path : "/org/freedesktop/Hal/Manager", `interface : "org.freedesktop.Hal.Manager", -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0