January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55175 - /trunk/installation/src/include/inst_inc_first.ycp
by aschnell＠svn.opensuse.org 31 Jan '09

31 Jan '09

Author: aschnell Date: Sat Jan 31 20:21:47 2009 New Revision: 55175 URL: http://svn.opensuse.org/viewcvs/yast?rev=55175&view=rev Log: - removed inst_do_resize call in SetSystemUpdate Modified: trunk/installation/src/include/inst_inc_first.ycp Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Sat Jan 31 20:21:47 2009 @@ -140,7 +140,6 @@ "disks_activate", // disks activated before running upgrade "mode", // always doing update, is already preselected "update_partition", // no mounting - "do_resize", // why is this included in upgrade at all? it is empty anyway "prepdisk", // disks already mounted, it is dummy in update anyway ], { ProductControl::DisableModule (m); -- 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] r55174 - in /branches/tmp/lslezak/core/dbus/namespace_service: DBusModulesServer.cc DBusModulesServer.h modules_dbus_server.cc
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 18:33:51 2009 New Revision: 55174 URL: http://svn.opensuse.org/viewcvs/yast?rev=55174&view=rev Log: - handle multiple namespaces in the service Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Fri Jan 30 18:33:51 2009 @@ -36,23 +36,31 @@ } } -DBusModulesServer::DBusModulesServer(const std::string &name_space) : e(this), wfm(NULL) +DBusModulesServer::DBusModulesServer(const NameSpaceList &name_spaces) : e(this), wfm(NULL) { init_wfm(); - Import import(name_space); // has an iternal static cache + for (NameSpaceList::const_iterator it = name_spaces.begin(); + it != name_spaces.end(); + ++it) + { + Import import(*it); // has an iternal static cache - ns = import.nameSpace(); + Y2Namespace *ns = import.nameSpace(); - if (ns == NULL) - { - y2error("Import name space %s failed", name_space.c_str()); - } - else - { - ns->initialize(); - y2milestone("Imported name space: %s", name_space.c_str()); + if (ns == NULL) + { + y2error("Import name space %s failed", it->c_str()); + } + else + { + ns->initialize(); + y2milestone("Imported name space: %s", it->c_str()); + + nsmap[*it] = ns; + } } + } DBusModulesServer::~DBusModulesServer() @@ -67,6 +75,12 @@ void DBusModulesServer::registerFunctions(const std::string &interface_prefix) { + for (NameSpaceMap::const_iterator it = nsmap.begin(); + it != nsmap.end(); + ++it) + { + Y2Namespace *ns = it->second; + if (ns) { unsigned symbols = ns->symbolCount(); @@ -136,6 +150,7 @@ index++; } } + } } std::string DBusModulesServer::Y2Dtype(constTypePtr type) const @@ -176,8 +191,10 @@ return ret; } -constTypePtr DBusModulesServer::searchFuncType(const std::string &fname) const +constTypePtr DBusModulesServer::searchFuncType(const std::string &objname, const std::string &fname) const { + Y2Namespace *ns = nsmap.find(objname)->second; + if (ns) { unsigned symbols = ns->symbolCount(); @@ -221,8 +238,17 @@ DBusMsg reply; std::string method = request.method(); + std::string object = request.path(); - constTypePtr t = searchFuncType(method); + // remove the leading slash from the object name + if (!object.empty() && object[0] == '/') + { + object.erase(object.begin()); + } + + y2debug("Requested object: %s, method: %s", object.c_str(), method.c_str()); + + constTypePtr t = searchFuncType(object, method); if (t) { @@ -231,28 +257,34 @@ if (request.arguments() == reqarg) { - // create function call - Y2Function *y2func = ns->createFunctionCall(method.c_str(), t); + // TODO improve it, Y2Namespace was already found in searchFuncType() + Y2Namespace *ns = nsmap[object]; - if (y2func) + if (ns) { - int index = 0; + // create function call + Y2Function *y2func = ns->createFunctionCall(method.c_str(), t); - while(index < reqarg) + if (y2func) { - YCPValue arg = request.getYCPValue(index); - y2func->appendParameter(arg); - index ++; - } + int index = 0; - if (y2func->finishParameters()) - { - // call the function - ret = y2func->evaluateCall(); - } - else - { - y2error("Wrong parameters to function %s", method.c_str()); + while(index < reqarg) + { + YCPValue arg = request.getYCPValue(index); + y2func->appendParameter(arg); + index ++; + } + + if (y2func->finishParameters()) + { + // call the function + ret = y2func->evaluateCall(); + } + else + { + y2error("Wrong parameters to function %s", method.c_str()); + } } } } Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Fri Jan 30 18:33:51 2009 @@ -15,6 +15,7 @@ #include <y2/Y2Component.h> #include <functional> +#include <list> class Y2Namespace; @@ -22,7 +23,9 @@ { public: - DBusModulesServer(const std::string &name_space); + typedef std::list<std::string> NameSpaceList; + + DBusModulesServer(const NameSpaceList &name_spaces); virtual ~DBusModulesServer(); virtual bool connect(); @@ -30,10 +33,11 @@ private: - // the wrapped Yast namespace - Y2Namespace *ns; + // the wrapped Yast namespaces + typedef std::map<const std::string, Y2Namespace *> NameSpaceMap; + NameSpaceMap nsmap; - constTypePtr searchFuncType(const std::string &fname) const; + constTypePtr searchFuncType(const std::string &objname, const std::string &fname) const; std::string Y2Dtype(constTypePtr type) const; // register the functions from the namespace to DBus service Modified: branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/modules_dbus_server.cc Fri Jan 30 18:33:51 2009 @@ -18,44 +18,35 @@ bool forever = false; bool badopts = false; - std::string module; + DBusModulesServer::NameSpaceList modules; if (argc > 1) { - if (!strcmp(argv[1], "--disable-timer")) // like in packagekitd + + int index = 1; + + if (!strcmp(argv[index], "--disable-timer")) // like in packagekitd { forever = true; - - if (argc > 2) - { - module = argv[2]; - } - else - { - badopts = true; - } + ++index; } - else - { - module = argv[1]; - if (argc > 2) - badopts = true; + while(index < argc) + { + modules.push_back(argv[index]); + index++; } - - if (argc > 3) - badopts = true; } else badopts = true; - if (badopts) + if (badopts || modules.empty()) { - y2error ("Usage: %s [--disable-timer] <YCP_namespace>", argv[0]); - std::cerr << "Usage: " << argv[0] << " [--disable-timer] <YCP_namespace>" << std::endl; + y2error ("Usage: %s [--disable-timer] namespace <namespace> <namespace>....", argv[0]); + std::cerr << "Usage: " << argv[0] << " [--disable-timer] namespace <namespace> <namespace>..." << std::endl; return 1; } - DBusModulesServer server(module); + DBusModulesServer server(modules); bool connected = server.connect(); if (connected) -- 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] r55173 - in /trunk/autoinstallation: doc/CreateProfileDetails.xml scripts/create_update_source.sh src/include/conftree.ycp
by ug＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: ug Date: Fri Jan 30 16:23:17 2009 New Revision: 55173 URL: http://svn.opensuse.org/viewcvs/yast?rev=55173&view=rev Log: some better explanation of the ask-dialog answer files Removed: trunk/autoinstallation/scripts/create_update_source.sh Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml trunk/autoinstallation/src/include/conftree.ycp Modified: trunk/autoinstallation/doc/CreateProfileDetails.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/CreateProfi… ============================================================================== --- trunk/autoinstallation/doc/CreateProfileDetails.xml (original) +++ trunk/autoinstallation/doc/CreateProfileDetails.xml Fri Jan 30 16:23:17 2009 @@ -3153,7 +3153,7 @@ </row> <row> <entry>file (available since SLES10 SP1 and SL 10.2)</entry> - <entry>you can store the answer to a question in a file, to use it in one of your scripts later. + <entry>you can store the answer to a question in a file, to use it in one of your scripts later. If you ask during stage=inital and you want to use the answer in stage2, then you have to copy the answer-file in a chroot script that is running as chrooted=false. Do it like this "cp /tmp/my_answer /mnt/tmp/". The reason for that is, that /tmp in stage1 is just in the RAM disk and will get lost after the reboot but the installed system is already mounted at /mnt/ <para><screen><file>/tmp/answer_hostname</file></screen></para></entry> <entry>this information is optional but you should at least provie <emphasis>path</emphasis> or <emphasis>file</emphasis></entry> </row> Modified: trunk/autoinstallation/src/include/conftree.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/con… ============================================================================== --- trunk/autoinstallation/src/include/conftree.ycp (original) +++ trunk/autoinstallation/src/include/conftree.ycp Fri Jan 30 16:23:17 2009 @@ -100,7 +100,7 @@ `HSpacing(1), `VBox( `PushButton( `id(`read), _("&Clone") ), - `PushButton( `id(`writeNow), _("&Apply to system") ) + `PushButton( `id(`writeNow), _("&Apply to System") ) ), `HStretch(), `VBox( -- 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] r55172 - in /branches/tmp/lslezak/core/dbus/namespace_service: DBusModulesServer.cc DBusModulesServer.h Makefile.am
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 16:20:58 2009 New Revision: 55172 URL: http://svn.opensuse.org/viewcvs/yast?rev=55172&view=rev Log: - import a Yast name space including nested namespaces, use generic import (language independent) Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Fri Jan 30 16:20:58 2009 @@ -10,6 +10,7 @@ #include <ycp/Bytecode.h> #include <ycp/YBlock.h> +#include <ycp/Import.h> #include <y2/Y2Namespace.h> #include <y2/Y2Function.h> #include <y2/Y2PluginComponent.h> @@ -20,49 +21,48 @@ #include <functional> -DBusModulesServer::DBusModulesServer(const std::string &name_space) : e(this) -{ - // create the namespace - YBlockPtr block = Bytecode::readModule(name_space); +#include <Y2WFMComponent.h> - if (block == NULL) +void DBusModulesServer::init_wfm() +{ + if (Y2WFMComponent::instance() == NULL) { - y2milestone("Loading YCP namespace failed, laoding plugin..."); + wfm = Y2ComponentBroker::createClient("wfm"); - Y2PluginComponent* comp = NULL; - // try to load the library - for (int level = 0; level < Y2PathSearch::numberOfComponentLevels (); - level++) + if (wfm == NULL) { - std::string filename = Y2PathSearch::findy2plugin(name_space, level); - if (filename.empty ()) - continue; + y2error("Cannot create WFM component"); + } + } +} - y2debug ("Trying file '%s'", filename.c_str ()); +DBusModulesServer::DBusModulesServer(const std::string &name_space) : e(this), wfm(NULL) +{ + init_wfm(); - comp = new Y2PluginComponent(filename, name_space.c_str(), name_space.c_str(), name_space.c_str()); - if (comp) break; - } + Import import(name_space); // has an iternal static cache - if (comp) - { - // use the internal component, that should provide the namespace - Y2Component *c = comp->component(); - - if (c) - ns = c->import(name_space.c_str()); - } - else - ns = NULL; + ns = import.nameSpace(); + + if (ns == NULL) + { + y2error("Import name space %s failed", name_space.c_str()); } else { - ns = block->nameSpace(); + ns->initialize(); + y2milestone("Imported name space: %s", name_space.c_str()); } } DBusModulesServer::~DBusModulesServer() { + if (wfm != NULL) + { + y2milestone("Deleting WFM component"); + delete wfm; + wfm = NULL; + } } void DBusModulesServer::registerFunctions(const std::string &interface_prefix) Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Fri Jan 30 16:20:58 2009 @@ -12,6 +12,7 @@ #include <DBusMsg.h> #include <ycp/TypePtr.h> +#include <y2/Y2Component.h> #include <functional> @@ -54,6 +55,10 @@ }; Callback e; + + Y2Component *wfm; + + void init_wfm(); }; Modified: branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Makefile.am Fri Jan 30 16:20:58 2009 @@ -12,9 +12,9 @@ modules_dbus_server_SOURCES = modules_dbus_server.cc DBusModulesServer.cc DBusModulesServer.h -modules_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/liby2dbus/src -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include +modules_dbus_server_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(POLKIT_CFLAGS) -I$(top_builddir)/liby2dbus/src -I$(srcdir)/../../scr/src -I$(top_builddir)/libscr/src/include -I$(top_builddir)/wfm/src -modules_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la +modules_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la $(top_builddir)/wfm/src/libpy2wfm.la # service activation config -- 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] r55171 - /tags/stable-2_18_0/restore/
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 16:20:09 2009 New Revision: 55171 URL: http://svn.opensuse.org/viewcvs/yast?rev=55171&view=rev Log: Created tag stable-2_18_0 for restore Added: tags/stable-2_18_0/restore/ - copied from r55170, trunk/restore/ -- 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] r55170 - /tags/branch-Code-11-2_17_1/restore/
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 15:30:17 2009 New Revision: 55170 URL: http://svn.opensuse.org/viewcvs/yast?rev=55170&view=rev Log: Created tag branch-Code-11-2_17_1 for restore Added: tags/branch-Code-11-2_17_1/restore/ - copied from r55169, branches/SuSE-Code-11-Branch/restore/ -- 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] r55169 - /trunk/restore/src/summary_dialog.ycp
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 15:23:28 2009 New Revision: 55169 URL: http://svn.opensuse.org/viewcvs/yast?rev=55169&view=rev Log: Fixed syntax errror Modified: trunk/restore/src/summary_dialog.ycp Modified: trunk/restore/src/summary_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/summary_dialog.ycp?r… ============================================================================== --- trunk/restore/src/summary_dialog.ycp (original) +++ trunk/restore/src/summary_dialog.ycp Fri Jan 30 15:23:28 2009 @@ -142,8 +142,8 @@ if (SCR::Write (.target.string, tmpfile, detail_text)) { if ((integer) SCR::Execute ( .target.bash, - sformat ("perl -pi -e \"s/<BR>/\\n\/g;\" '%1'", String::Quote (tmpfile)) == 0 - ) { + sformat ("perl -pi -e \"s/<BR>/\\n\/g;\" '%1'", String::Quote (tmpfile)) + ) == 0) { detail_text = (string) SCR::Read (.target.string, tmpfile); } } -- 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] r55168 - /branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 15:23:18 2009 New Revision: 55168 URL: http://svn.opensuse.org/viewcvs/yast?rev=55168&view=rev Log: Fixed syntax error Modified: branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp Modified: branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/s… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp (original) +++ branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp Fri Jan 30 15:23:18 2009 @@ -142,8 +142,8 @@ if (SCR::Write (.target.string, tmpfile, detail_text)) { if ((integer) SCR::Execute ( .target.bash, - sformat ("perl -pi -e \"s/<BR>/\\n\/g;\" '%1'", String::Quote (tmpfile)) == 0 - ) { + sformat ("perl -pi -e \"s/<BR>/\\n\/g;\" '%1'", String::Quote (tmpfile)) + ) == 0) { detail_text = (string) SCR::Read (.target.string, tmpfile); } } -- 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] r55167 - /tags/branch-Code-11-2_17_1/restore/
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 15:20:43 2009 New Revision: 55167 URL: http://svn.opensuse.org/viewcvs/yast?rev=55167&view=rev Log: Hmm2 Removed: tags/branch-Code-11-2_17_1/restore/ -- 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] r55166 - /tags/branch-Code-11-2_17_1/restore/
by locilka＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: locilka Date: Fri Jan 30 12:53:08 2009 New Revision: 55166 URL: http://svn.opensuse.org/viewcvs/yast?rev=55166&view=rev Log: Created tag branch-Code-11-2_17_1 for restore Added: tags/branch-Code-11-2_17_1/restore/ - copied from r55165, branches/SuSE-Code-11-Branch/restore/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0