August 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r58250 - /trunk/core/liby2dbus/
by lslezak＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: lslezak Date: Mon Aug 3 09:58:06 2009 New Revision: 58250 URL: http://svn.opensuse.org/viewcvs/yast?rev=58250&view=rev Log: - removed liby2dbus subdirectory (moved to dbus-server) Removed: trunk/core/liby2dbus/ -- 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] r58249 - in /trunk/core: ./ agent-dbus/ dbus/ libscr/src/ libscr/src/include/scr/ libscr/testsuite/ liby2dbus/ scr/src/
by lslezak＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: lslezak Date: Mon Aug 3 09:56:21 2009 New Revision: 58249 URL: http://svn.opensuse.org/viewcvs/yast?rev=58249&view=rev Log: - merged changes from tmp/lslezak branch (the DBus part has been moved to separate packages) Removed: trunk/core/agent-dbus/ trunk/core/dbus/ Modified: trunk/core/ (props changed) trunk/core/SUBDIRS trunk/core/VERSION trunk/core/configure.in.in trunk/core/libscr/src/Makefile.am trunk/core/libscr/src/SCR.cc trunk/core/libscr/src/include/scr/SCR.h trunk/core/libscr/testsuite/Makefile.am trunk/core/liby2dbus/ (props changed) trunk/core/scr/src/Makefile.am trunk/core/yast2-core.spec.in Modified: trunk/core/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/SUBDIRS?rev=58249&r1=58248&… ============================================================================== --- trunk/core/SUBDIRS (original) +++ trunk/core/SUBDIRS Mon Aug 3 09:56:21 2009 @@ -1 +1 @@ -liby2util-r liby2 libycp liby2dbus libscr agent-dummy scr agent-system agent-dbus agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs dbus +liby2util-r liby2 libycp libscr agent-dummy scr agent-system agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=58249&r1=58248&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Mon Aug 3 09:56:21 2009 @@ -1 +1 @@ -2.18.16 +2.18.16.1 Modified: trunk/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/configure.in.in?rev=58249&r… ============================================================================== --- trunk/core/configure.in.in (original) +++ trunk/core/configure.in.in Mon Aug 3 09:56:21 2009 @@ -94,88 +94,10 @@ AC_MSG_ERROR(Headers for blocxx are missing. Please install the package blocxx-devel.) fi -PKG_CHECK_MODULES(DBUS, dbus-1) - -## check for PolicyKit -AC_ARG_ENABLE([policykit], - AS_HELP_STRING([--enable-policykit], [Enable experimental PolicyKit support]), - [ - case "${enableval}" in - yes) policykit=yes ;; - no) policykit=no ;; - *) AC_MSG_ERROR(--enable-policykit: Unknwon value ${enableval}) ;; - esac - ], - [policykit=yes]) - -if test "x${policykit}" == xyes ; then - PKG_CHECK_MODULES(POLKIT, [ polkit-dbus >= 0.7 ], - [ - HAVE_POLKIT=1 - AC_DEFINE([HAVE_POLKIT], 1, [Have PolicyKit]) - policydir=`pkg-config polkit-dbus --variable prefix`/share/PolicyKit/policy/ - AC_SUBST(policydir) - ], - [ - HAVE_POLKIT=0 - AC_MSG_ERROR([*** PolicyKit support not found, install PolicyKit-devel: 'zypper in PolicyKit-devel' or libpolkit-dbus-dev.deb]) - ]) -else - HAVE_POLKIT=0 -fi - -# -# configuration for dbus/SCR_service -# - -# set access mode according to the PolicyKit status -# if policykit is disabled only root can access the service -if test $HAVE_POLKIT -ne 0; then -ACCESS_MODE=allow -else -ACCESS_MODE=deny -fi - -YAST_DBUS_SERVICE=org.opensuse.YaST.modules -AC_SUBST(YAST_DBUS_SERVICE) -YAST_DBUS_RAW_INTERFACE=org.opensuse.YaST.Values -AC_SUBST(YAST_DBUS_RAW_INTERFACE) -YAST_DBUS_YCP_INTERFACE=org.opensuse.YaST.YCPValues -AC_SUBST(YAST_DBUS_YCP_INTERFACE) -YAST_DBUS_MGR_INTERFACE=org.opensuse.YaST.modules.ModuleManager -AC_SUBST(YAST_DBUS_MGR_INTERFACE) -YAST_DBUS_OBJ_PREFIX=/org/opensuse/YaST/modules -AC_SUBST(YAST_DBUS_OBJ_PREFIX) - -YAST_POLKIT_PREFIX_MANAGER=org.opensuse.yast.module-manager -AC_SUBST(YAST_POLKIT_PREFIX_MANAGER) - -YAST_SCR_SERVICE=org.opensuse.yast.SCR -YAST_SCR_INTERFACE=$YAST_SCR_SERVICE.Methods -# @ybindir@ expands to ${prefix}/lib/..., force full expansion here -YAST_SCR_SERVICE_DIR=$ybindir -AC_SUBST(YAST_SCR_SERVICE) -AC_SUBST(YAST_SCR_INTERFACE) -AC_SUBST(YAST_SCR_SERVICE_DIR) - -AC_SUBST(ACCESS_MODE) - -AC_SUBST(POLKIT_CFLAGS) -AC_SUBST(POLKIT_LIBS) -AC_SUBST(HAVE_POLKIT) -AM_CONDITIONAL([HAVE_POLKIT], [test "x$HAVE_POLKIT" = x1]) ## and generate the output AC_CONFIG_FILES([ scr/doc/SCR.html scr/doc/intro_to_scr.html - dbus/namespace_service/src/yast_dbus_names.h - dbus/namespace_service/src/org.opensuse.yast.module-manager.policy - dbus/namespace_service/src/org.opensuse.YaST.modules.conf - dbus/namespace_service/src/org.opensuse.YaST.modules.service.in - dbus/SCR_service/org.opensuse.yast.SCR.conf - dbus/SCR_service/org.opensuse.yast.SCR.service.in - dbus/SCR_service/scr_names.h - dbus/SCR_service/test_SCR_dbus_server.rb ]) @YAST2-OUTPUT@ Modified: trunk/core/libscr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libscr/src/Makefile.am?rev=… ============================================================================== --- trunk/core/libscr/src/Makefile.am (original) +++ trunk/core/libscr/src/Makefile.am Mon Aug 3 09:56:21 2009 @@ -11,15 +11,9 @@ libscr_la_SOURCES = \ SCRAgent.cc SCR.cc -libscr_la_CPPFLAGS = $(DBUS_CFLAGS) - -libscr_la_LIBADD = $(srcdir)/../../liby2dbus/src/liby2dbus.la - INCLUDES = \ -I$(srcdir)/../../libycp/src/include \ -I$(srcdir)/../../liby2/src/include \ - -I$(srcdir)/../../liby2dbus/src \ - -I$(srcdir)/../../scr/src \ -I$(srcdir)/include \ ${Y2UTIL_CFLAGS} Modified: trunk/core/libscr/src/SCR.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libscr/src/SCR.cc?rev=58249… ============================================================================== --- trunk/core/libscr/src/SCR.cc (original) +++ trunk/core/libscr/src/SCR.cc Mon Aug 3 09:56:21 2009 @@ -29,104 +29,12 @@ #include "ycp/y2log.h" #include "scr/SCRAgent.h" -#include "DBusConn.h" -#include "DBusMsg.h" - extern StaticDeclaration static_declarations; bool SCR::registered = false; -// DBus related variables -DBusConn *connection; - -bool check_dbus_env() -{ - const char* y2dbus = ::getenv("Y2DBUS"); - - if (y2dbus != NULL) - { - if (::strcmp(y2dbus, "1") == 0) - return true; - } - - return false; -} - -static YCPValue CallDBus(const char *method, const YCPPath &path = YCPNull(), const YCPValue &args = YCPNull (), - const YCPValue &opt = YCPNull ()) -{ - - y2milestone("Calling DBus method %s: path: %s, args: %s, opt: %s", method, path.isNull() ? "NULL" : path->toString().c_str(), args.isNull() ? "NULL" : args->toString().c_str(), opt.isNull() ? "NULL" : opt->toString().c_str()); - - DBusMsg msg; - // TODO create constants for these strings - msg.createCall("org.opensuse.yast.SCR", "/SCR", "org.opensuse.yast.SCR.Methods", method); - - if (!path.isNull()) - { - msg.addYCPValue(path); - } - - if (!args.isNull()) - { - msg.addYCPValue(args); - } - - if (!opt.isNull()) - { - msg.addYCPValue(opt); - } - - // send the message and get the response - DBusMsg reply(connection->call(msg)); - - y2debug("Received reply type: %d", reply.type()); - - // return the first argument from the reply - YCPValue ret; - try - { - ret = reply.getYCPValue(0, Type::Unspec); - } - catch (const DBusException& de) - { - y2error ("Caught: %s: %s", de.name().c_str(), de.message().c_str()); - } - - // validate the reply (check for exceptions) - if (reply.type() != DBUS_MESSAGE_TYPE_METHOD_RETURN) - { - if (reply.type() == DBUS_MESSAGE_TYPE_ERROR) - { - if (!ret.isNull()) - { - y2error("Received Error reply: %s", ret->toString().c_str()); - } - } - - return YCPVoid(); - } - - if (!ret.isNull()) - { - y2milestone("Received reply: %s", ret->toString().c_str()); - } - else - { - y2error("Received YCPNull or the value is missing"); - } - - return ret; -} - static YCPValue SCRRead3 (const YCPPath &path, const YCPValue &args = YCPNull (), const YCPValue &opt = YCPNull ()) { - - if (connection != NULL) - { - return CallDBus("Read", path, args, opt); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -151,11 +59,6 @@ SCRWrite2 (const YCPPath &path, const YCPValue& value_n) { YCPValue value = value_n.isNull()? YCPVoid(): value_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Write", path, value); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -170,11 +73,6 @@ YCPValue value = value_n.isNull()? YCPVoid(): value_n; // bnc#406138 YCPValue arg = arg_n.isNull()? YCPVoid(): arg_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Write", path, value, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -186,11 +84,6 @@ static YCPValue SCRDir (const YCPPath& path) { - if (connection != NULL) - { - return CallDBus("Dir", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -202,11 +95,6 @@ static YCPValue SCRExecute (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("Execute", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -218,11 +106,6 @@ static YCPValue SCRError (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("Error", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -238,11 +121,6 @@ SCRExecute2 (const YCPPath &path, const YCPValue &arg_n) { YCPValue arg = arg_n.isNull()? YCPVoid(): arg_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Execute", path, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -260,11 +138,6 @@ YCPValue arg = arg_n.isNull()? YCPVoid(): arg_n; // bnc#406138 YCPValue opt = opt_n.isNull()? YCPVoid(): opt_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Execute", path, arg, opt); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -279,11 +152,6 @@ static YCPValue SCRRegisterAgentS (const YCPPath &path, const YCPString &arg) { - if (connection != NULL) - { - return CallDBus("RegisterAgent", path, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -297,11 +165,6 @@ static YCPValue SCRRegisterAgentT (const YCPPath &path, const YCPTerm &arg) { - if (connection != NULL) - { - return CallDBus("RegisterAgent", path, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -315,11 +178,6 @@ static YCPValue SCRUnregisterAgent (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("UnregisterAgent", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -332,11 +190,6 @@ static YCPValue SCRUnregisterAllAgents () { - if (connection != NULL) - { - return CallDBus("UnregisterAllAgents"); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -348,11 +201,6 @@ static YCPValue SCRUnmountAgent (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("UnmountAgent", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -365,11 +213,6 @@ static YCPValue SCRRegisterNewAgents () { - if (connection != NULL) - { - return CallDBus("RegisterNewAgents"); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -415,33 +258,5 @@ static_declarations.registerDeclarations ("SCR", declarations); registered = true; - - bool y2dbus = check_dbus_env(); - - // use std SCR or DBUS SCR? - if (y2dbus) - { - y2debug("Y2DBUS is set, using DBUS for SCR access"); - connection = new DBusConn; - - // connect to the system bus - if (!connection->connect(DBUS_BUS_SYSTEM)) - { - y2error("Cannot connect to DBus, exiting..."); - exit(1); - } - } - else - { - y2debug("Y2DBUS is not set, using embedded SCR"); - } } -SCR::~SCR() -{ - if (connection != NULL) - { - delete connection; - connection = NULL; - } -} Modified: trunk/core/libscr/src/include/scr/SCR.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libscr/src/include/scr/SCR.… ============================================================================== --- trunk/core/libscr/src/include/scr/SCR.h (original) +++ trunk/core/libscr/src/include/scr/SCR.h Mon Aug 3 09:56:21 2009 @@ -25,7 +25,6 @@ public: SCR (); - ~SCR(); static bool registered; }; Modified: trunk/core/libscr/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libscr/testsuite/Makefile.a… ============================================================================== --- trunk/core/libscr/testsuite/Makefile.am (original) +++ trunk/core/libscr/testsuite/Makefile.am Mon Aug 3 09:56:21 2009 @@ -12,7 +12,7 @@ noinst_PROGRAMS = runscr runscr_SOURCES = runscr.cc -runscr_LDADD = ${AGENT_LIBADD} ../../liby2dbus/src/liby2dbus.la +runscr_LDADD = ${AGENT_LIBADD} PACKAGE = libscr AUTOMAKE_OPTIONS = dejagnu Modified: trunk/core/scr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/scr/src/Makefile.am?rev=582… ============================================================================== --- trunk/core/scr/src/Makefile.am (original) +++ trunk/core/scr/src/Makefile.am Mon Aug 3 09:56:21 2009 @@ -30,6 +30,13 @@ libpy2scr_la_LDFLAGS = -version-info 2:0 +libpy2scr_la_LIBADD = $(top_builddir)/libscr/src/libscr.la + INCLUDES = ${AGENT_INCLUDES} +pkgincludedir = $(includedir)/scr +# these go to $(pkgincludedir) +pkginclude_HEADERS = \ + ScriptingAgent.h \ + SCRSubAgent.h Modified: trunk/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/yast2-core.spec.in?rev=5824… ============================================================================== --- trunk/core/yast2-core.spec.in (original) +++ trunk/core/yast2-core.spec.in Mon Aug 3 09:56:21 2009 @@ -24,11 +24,6 @@ # libycp includes crypto built-ins BuildRequires: libxcrypt-devel -# for SCR DBus service -BuildRequires: dbus-1-devel PolicyKit-devel -# for DBus testing -BuildRecommends: python-base dbus-1-python - Summary: YaST2 - Core Libraries Requires: perl = %{perl_version} Provides: liby2util = 2.16.1 @@ -45,7 +40,6 @@ Requires: libxcrypt-devel hwinfo-devel Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils # required for libscr -Requires: PolicyKit-devel dbus-1-devel # for FlexLexer.h; I think that this dependency could be made # private but it seems not worth the effort Requires: flex @@ -113,20 +107,6 @@ # .packlist %{perl_vendorarch}/auto/ycp /var/adm/perl-modules/%name -# DBus service -@ybindir@/SCR_dbus_server -# DBus service config -/usr/share/dbus-1/system-services/org.opensuse.yast.SCR.service -%config /etc/dbus-1/system.d/org.opensuse.yast.SCR.conf -# PolicyKit default policies -/usr/share/PolicyKit/policy/org.opensuse.yast.scr.policy - -# DBus namespace service -@ybindir@/yast_modules_dbus_server -/usr/share/dbus-1/system-services/org.opensuse.YaST.modules.service -%config /etc/dbus-1/system.d/org.opensuse.YaST.modules.conf -/usr/share/PolicyKit/policy/org.opensuse.yast.module-manager.policy - %files devel %defattr(-,root,root) -- 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] r58248 - /branches/tmp/lslezak/dbus-server/ /trunk/dbus-server/
by lslezak＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: lslezak Date: Mon Aug 3 09:54:57 2009 New Revision: 58248 URL: http://svn.opensuse.org/viewcvs/yast?rev=58248&view=rev Log: - dbus-server moved from tmp/lslezak to trunk Added: trunk/dbus-server/ - copied from r58247, branches/tmp/lslezak/dbus-server/ Removed: branches/tmp/lslezak/dbus-server/ -- 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] r58247 - /branches/tmp/lslezak/dbus-client/ /trunk/dbus-client/
by lslezak＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: lslezak Date: Mon Aug 3 09:52:14 2009 New Revision: 58247 URL: http://svn.opensuse.org/viewcvs/yast?rev=58247&view=rev Log: - dbus-client moved from tmp/lslezak to trunk Added: trunk/dbus-client/ - copied from r58246, branches/tmp/lslezak/dbus-client/ Removed: branches/tmp/lslezak/dbus-client/ -- 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] r58246 - /tags/branch-SLE-10-SP2-2_13_155_2/bootloader/
by juhliarik＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: juhliarik Date: Mon Aug 3 09:40:44 2009 New Revision: 58246 URL: http://svn.opensuse.org/viewcvs/yast?rev=58246&view=rev Log: Created tag branch-SLE-10-SP2-2_13_155_2 for bootloader Added: tags/branch-SLE-10-SP2-2_13_155_2/bootloader/ - copied from r58245, branches/SuSE-SLE-10-SP2-Branch/bootloader/ -- 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] r58245 - /branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: juhliarik Date: Mon Aug 3 09:40:35 2009 New Revision: 58245 URL: http://svn.opensuse.org/viewcvs/yast?rev=58245&view=rev Log: corrected change log Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/bootlo… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/bootloader/package/yast2-bootloader.changes Mon Aug 3 09:40:35 2009 @@ -3444,13 +3444,6 @@ - Report error when boot loader installation fails. ------------------------------------------------------------------- -Wed Oct 30 21:44:47 CET 2002 - kukuk(a)suse.de - -- fix log path in dosilo script -- update_silo_conf: modify version number in /boot/message -- BootSILO.ycp: Don't show popup on success when installing silo - -------------------------------------------------------------------- Wed Nov 13 09:08:12 CET 2002 - jsrain(a)suse.cz - again fixed installing a kernel to *NWSSTG when root is on RAID @@ -3776,7 +3769,7 @@ - 2.6.32 ------------------------------------------------------------------- -Wed Aug 28 12:13:05 CEST 2002 - kkaempf(a)suse.de +Wed Aug 28 10:13:05 CEST 2002 - kkaempf(a)suse.de - fix checking for splashscreen - 2.6.31 -- 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] r58244 - /tags/branch-SLE-10-SP2-2_13_155_2/bootloader/
by juhliarik＠svn.opensuse.org 03 Aug '09

03 Aug '09

Author: juhliarik Date: Mon Aug 3 09:38:12 2009 New Revision: 58244 URL: http://svn.opensuse.org/viewcvs/yast?rev=58244&view=rev Log: updated change log Removed: tags/branch-SLE-10-SP2-2_13_155_2/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0