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

[yast-commit] r55165 - /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:51:10 2009 New Revision: 55165 URL: http://svn.opensuse.org/viewcvs/yast?rev=55165&view=rev Log: Hmm 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] r55164 - /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:50:24 2009 New Revision: 55164 URL: http://svn.opensuse.org/viewcvs/yast?rev=55164&view=rev Log: Created tag branch-Code-11-2_17_1 for restore Added: tags/branch-Code-11-2_17_1/restore/ - copied from r55163, 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] r55163 - in /trunk/yast2: package/yast2.changes scripts/yast2-completion.sh
by jsrain＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: jsrain Date: Fri Jan 30 11:39:10 2009 New Revision: 55163 URL: http://svn.opensuse.org/viewcvs/yast?rev=55163&view=rev Log: fixed bash completion (bnc #470544) Modified: trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2-completion.sh Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jan 30 11:39:10 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz + +- fixed bash completion (bnc #470544) + +------------------------------------------------------------------- Wed Jan 28 11:55:29 CET 2009 - lslezak(a)suse.cz - PackagesUI - removed textdomain switches Modified: trunk/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2-completion.s… ============================================================================== --- trunk/yast2/scripts/yast2-completion.sh (original) +++ trunk/yast2/scripts/yast2-completion.sh Fri Jan 30 11:39:10 2009 @@ -18,7 +18,7 @@ fi cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then + if [[ ${#COMP_WORDS[@]} -ge 3 && $COMP_CWORD -ge 2 ]]; then prevprev=${COMP_WORDS[COMP_CWORD-2]} fi if [[ $cur == '-' ]]; then -- 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] r55162 - /tags/branch-Code-11-2_17_64/yast2/
by jsrain＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: jsrain Date: Fri Jan 30 11:31:47 2009 New Revision: 55162 URL: http://svn.opensuse.org/viewcvs/yast?rev=55162&view=rev Log: Created tag branch-Code-11-2_17_64 for yast2 Added: tags/branch-Code-11-2_17_64/yast2/ - copied from r55161, branches/SuSE-Code-11-Branch/yast2/ -- 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] r55161 - in /branches/SuSE-Code-11-Branch/yast2: VERSION package/yast2.changes scripts/yast2-completion.sh
by jsrain＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: jsrain Date: Fri Jan 30 11:31:38 2009 New Revision: 55161 URL: http://svn.opensuse.org/viewcvs/yast?rev=55161&view=rev Log: fixed bash completion (bnc #470544) Modified: branches/SuSE-Code-11-Branch/yast2/VERSION branches/SuSE-Code-11-Branch/yast2/package/yast2.changes branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh Modified: branches/SuSE-Code-11-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-Branch/yast2/VERSION Fri Jan 30 11:31:38 2009 @@ -1 +1 @@ -2.17.63 +2.17.64 Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Fri Jan 30 11:31:38 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 30 11:14:42 CET 2009 - jsrain(a)suse.cz + +- fixed bash completion (bnc #470544) +- 2.17.64 + +------------------------------------------------------------------- Mon Jan 26 13:08:55 CET 2009 - locilka(a)suse.cz - Fixing ProductControl to avoid leaving a workflow by with the Modified: branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/scr… ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh (original) +++ branches/SuSE-Code-11-Branch/yast2/scripts/yast2-completion.sh Fri Jan 30 11:31:38 2009 @@ -18,7 +18,7 @@ fi cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then + if [[ ${#COMP_WORDS[@]} -ge 3 && $COMP_CWORD -ge 2 ]]; then prevprev=${COMP_WORDS[COMP_CWORD-2]} fi if [[ $cur == '-' ]]; then -- 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] r55160 - /tags/branch-Code-11-2_17_14/product-creator/
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:41:18 2009 New Revision: 55160 URL: http://svn.opensuse.org/viewcvs/yast?rev=55160&view=rev Log: Created tag branch-Code-11-2_17_14 for product-creator Added: tags/branch-Code-11-2_17_14/product-creator/ - copied from r55159, branches/SuSE-Code-11-Branch/product-creator/ -- 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] r55159 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes src/complex.ycp
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:28:04 2009 New Revision: 55159 URL: http://svn.opensuse.org/viewcvs/yast?rev=55159&view=rev Log: - unload all sources after changing a configuration to reset the internal state so the correct "cross-ppc-binutils" package is installed (bnc#469191) - 2.17.14 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Fri Jan 30 10:28:04 2009 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Fri Jan 30 10:28:04 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 30 09:21:09 CET 2009 - lslezak(a)suse.cz + +- unload all sources after changing a configuration to reset the + internal state so the correct "cross-ppc-binutils" package is + installed (bnc#469191) +- 2.17.14 + +------------------------------------------------------------------- Tue Jan 27 13:57:43 CET 2009 - lslezak(a)suse.cz - PPC boot files are optional (SLES11 does not contain 'inst32' Modified: branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/complex.ycp Fri Jan 30 10:28:04 2009 @@ -159,6 +159,8 @@ while(true) { // reset the current architecture (needed when going back) ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); ret = UI::UserInput(); -- 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] r55158 - in /branches/SuSE-Code-11-Branch/product-creator: package/yast2-product-creator.changes src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:27:25 2009 New Revision: 55158 URL: http://svn.opensuse.org/viewcvs/yast?rev=55158&view=rev Log: - PPC boot files are optional (SLES11 does not contain 'inst32' file) (bnc#469272) Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Fri Jan 30 10:27:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 13:57:43 CET 2009 - lslezak(a)suse.cz + +- PPC boot files are optional (SLES11 does not contain 'inst32' + file) (bnc#469272) + +------------------------------------------------------------------- Wed Nov 19 17:38:36 CET 2008 - lslezak(a)suse.cz - fixed creating cross-arch PPC product (cross-ppc-binutils, Modified: branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/ProductCreator.ycp Fri Jan 30 10:27:25 2009 @@ -1071,7 +1071,7 @@ foreach(string f, files, { - CopyFile(srcid, 1, f, target + f); + CopyOptionalFile(srcid, 1, f, target + f); } ); } -- 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] r55157 - in /trunk/product-creator: package/yast2-product-creator.changes src/complex.ycp
by lslezak＠svn.opensuse.org 30 Jan '09

30 Jan '09

Author: lslezak Date: Fri Jan 30 10:26:26 2009 New Revision: 55157 URL: http://svn.opensuse.org/viewcvs/yast?rev=55157&view=rev Log: - unload all sources after changing a configuration to reset the internal state so the correct "cross-ppc-binutils" package is installed (bnc#469191) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Jan 30 10:26:26 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 30 09:21:09 CET 2009 - lslezak(a)suse.cz + +- unload all sources after changing a configuration to reset the + internal state so the correct "cross-ppc-binutils" package is + installed (bnc#469191) + +------------------------------------------------------------------- Tue Jan 27 13:57:43 CET 2009 - lslezak(a)suse.cz - PPC boot files are optional (SLES11 does not contain 'inst32' Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Fri Jan 30 10:26:26 2009 @@ -159,6 +159,8 @@ while(true) { // reset the current architecture (needed when going back) ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); ret = UI::UserInput(); -- 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] r55156 - in /branches/SuSE-Code-11-Branch/restore: VERSION package/yast2-restore.changes src/Restore.ycp src/summary_dialog.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 19:36:29 2009 New Revision: 55156 URL: http://svn.opensuse.org/viewcvs/yast?rev=55156&view=rev Log: - Fixed displaying i18n characters in summary (bnc #460674). - Save summary to file - huge speedup (bnc #460674). - 2.17.1 Modified: branches/SuSE-Code-11-Branch/restore/VERSION branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes branches/SuSE-Code-11-Branch/restore/src/Restore.ycp branches/SuSE-Code-11-Branch/restore/src/summary_dialog.ycp Modified: branches/SuSE-Code-11-Branch/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/V… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/VERSION (original) +++ branches/SuSE-Code-11-Branch/restore/VERSION Thu Jan 29 19:36:29 2009 @@ -1 +1 @@ -2.17.0 +2.17.1 Modified: branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/p… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes (original) +++ branches/SuSE-Code-11-Branch/restore/package/yast2-restore.changes Thu Jan 29 19:36:29 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 19:21:35 CET 2009 - locilka(a)suse.cz + +- Fixed displaying i18n characters in summary (bnc #460674). +- Save summary to file - huge speedup (bnc #460674). +- 2.17.1 + +------------------------------------------------------------------- Tue Dec 16 15:42:40 CET 2008 - locilka(a)suse.cz - Fixed alignment of buttons (bnc #447102). Modified: branches/SuSE-Code-11-Branch/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/restore/s… ============================================================================== --- branches/SuSE-Code-11-Branch/restore/src/Restore.ycp (original) +++ branches/SuSE-Code-11-Branch/restore/src/Restore.ycp Thu Jan 29 19:36:29 2009 @@ -972,7 +972,7 @@ infofiles = infofiles + (compressed_packages_info ? "info/packages_info.gz" : "info/packages_info"); // unpack info files - result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C " + tempdir + " -x -f " + filename + " " + infofiles + " 2> /dev/null"); + result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C '" + String::Quote (tempdir) + "' -x -f " + filename + " " + infofiles + " 2> /dev/null"); date = (string) SCR::Read(.target.string, tempdir + "/info/date"); comment = (string) SCR::Read(.target.string, tempdir + "/info/comment"); @@ -1460,6 +1460,10 @@ } ); + // BNC #460674, Do not change the system locale + // It can change I18N characters in output + string locale_modifications = "export LANG=C; "; + if (fileinarchive == "") { y2error("Can't find subarchive for package %1", package); @@ -1478,14 +1482,14 @@ } ); - string command = "export LC_ALL=C; echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; + string command = locale_modifications + "echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; y2debug("Running command: %1", command); started = (boolean) SCR::Execute(.background.run, command); } else { - started = (boolean) SCR::Execute(.background.run, "export LC_ALL=C; /bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); + started = (boolean) SCR::Execute(.background.run, locale_modifications + "/bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); } // abort test cycle @@ -1563,11 +1567,11 @@ // for tar: --files-from=filename // create (s)tar command - string tarcommand = (star == false) ? ("export LC_ALL=C; /bin/tar -C " + targetdir + " " + string tarcommand = (star == false) ? (locale_modifications + "/bin/tar -C " + targetdir + " " + compress + " -x -v -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout") - : ("export LC_ALL=C; /usr/bin/star -C " + targetdir + " " + : (locale_modifications + "/usr/bin/star -C " + targetdir + " " + compress + " -x -v -U -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout"); 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 Thu Jan 29 19:36:29 2009 @@ -25,6 +25,8 @@ import "Popup"; import "Label"; +import "Directory"; +import "String"; /** * This function removes HTML tags from input string @@ -32,8 +34,7 @@ * @return string String without tags */ -define string RemoveTags(string input) ``{ - string ret = input; +define string RemoveTags(string & ret) ``{ map<string,string> tagmapping = $[ "BR" : "\n", "/P" : "\n", "P" : "", "B" : "", "/B" : "", "EM" : "", "/EM" : "", "I" : "", "/I" : "", "TT" : "", "/TT" : "", @@ -42,17 +43,22 @@ "H3" : "", "/H3" : "" ]; + string tag = nil; + string taglower = nil; + foreach(string t, string repl, tagmapping, ``{ - string tag = "<" + t + ">"; + tag = "<" + t + ">"; while (issubstring(ret, tag)) { ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); } - while (issubstring(ret, tolower(tag))) + taglower = tolower(tag); + + while (issubstring(ret, taglower)) { - ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); + ret = regexpsub(ret, "(.*)" + taglower + "(.*)", "\\1" + repl + "\\2"); } } ); @@ -120,7 +126,35 @@ if (savefile != "" && savefile != nil) { - SCR::Write(.target.string, savefile, RemoveTags(detail_text)); + // Create or empty the file + SCR::Write(.target.string, savefile, ""); + + // BNC #460674 + // Due to the very ineffective all-in-one-run function, removing HTML + // and writing thw whole file at once takes just too much time + // + // Fixed by going through the summary line by line (by <BR>s) + + string tmpfile = Directory::tmpdir + "/restore_tmpfile"; + + y2milestone ("Using tmpfile: %1", tmpfile); + // Using tmpfile - there are more powerful tools for parsing text + 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 + ) { + detail_text = (string) SCR::Read (.target.string, tmpfile); + } + } + + foreach (string one_line, splitstring (detail_text, "\n"), { + // <BR> == newline + one_line = one_line + "\n"; + // Appending lines one by one + SCR::Write (.backup.file_append, [savefile, RemoveTags (one_line)]); + }); + y2milestone("Summary saved to file: %1", savefile); } } -- 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] r55155 - in /trunk/restore: VERSION package/yast2-restore.changes src/Restore.ycp src/summary_dialog.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 19:36:15 2009 New Revision: 55155 URL: http://svn.opensuse.org/viewcvs/yast?rev=55155&view=rev Log: - Fixed displaying i18n characters in summary (bnc #460674). - Save summary to file - huge speedup (bnc #460674). - 2.18.0 Modified: trunk/restore/VERSION trunk/restore/package/yast2-restore.changes trunk/restore/src/Restore.ycp trunk/restore/src/summary_dialog.ycp Modified: trunk/restore/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/VERSION?rev=55155&r1=551… ============================================================================== --- trunk/restore/VERSION (original) +++ trunk/restore/VERSION Thu Jan 29 19:36:15 2009 @@ -1 +1 @@ -2.17.0 +2.18.0 Modified: trunk/restore/package/yast2-restore.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/package/yast2-restore.ch… ============================================================================== --- trunk/restore/package/yast2-restore.changes (original) +++ trunk/restore/package/yast2-restore.changes Thu Jan 29 19:36:15 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 19:21:35 CET 2009 - locilka(a)suse.cz + +- Fixed displaying i18n characters in summary (bnc #460674). +- Save summary to file - huge speedup (bnc #460674). +- 2.18.0 + +------------------------------------------------------------------- Tue Dec 16 15:42:40 CET 2008 - locilka(a)suse.cz - Fixed alignment of buttons (bnc #447102). Modified: trunk/restore/src/Restore.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/restore/src/Restore.ycp?rev=5515… ============================================================================== --- trunk/restore/src/Restore.ycp (original) +++ trunk/restore/src/Restore.ycp Thu Jan 29 19:36:15 2009 @@ -972,7 +972,7 @@ infofiles = infofiles + (compressed_packages_info ? "info/packages_info.gz" : "info/packages_info"); // unpack info files - result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C " + tempdir + " -x -f " + filename + " " + infofiles + " 2> /dev/null"); + result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C '" + String::Quote (tempdir) + "' -x -f " + filename + " " + infofiles + " 2> /dev/null"); date = (string) SCR::Read(.target.string, tempdir + "/info/date"); comment = (string) SCR::Read(.target.string, tempdir + "/info/comment"); @@ -1460,6 +1460,10 @@ } ); + // BNC #460674, Do not change the system locale + // It can change I18N characters in output + string locale_modifications = "export LANG=C; "; + if (fileinarchive == "") { y2error("Can't find subarchive for package %1", package); @@ -1478,14 +1482,14 @@ } ); - string command = "export LC_ALL=C; echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; + string command = locale_modifications + "echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; y2debug("Running command: %1", command); started = (boolean) SCR::Execute(.background.run, command); } else { - started = (boolean) SCR::Execute(.background.run, "export LC_ALL=C; /bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); + started = (boolean) SCR::Execute(.background.run, locale_modifications + "/bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); } // abort test cycle @@ -1563,11 +1567,11 @@ // for tar: --files-from=filename // create (s)tar command - string tarcommand = (star == false) ? ("export LC_ALL=C; /bin/tar -C " + targetdir + " " + string tarcommand = (star == false) ? (locale_modifications + "/bin/tar -C " + targetdir + " " + compress + " -x -v -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout") - : ("export LC_ALL=C; /usr/bin/star -C " + targetdir + " " + : (locale_modifications + "/usr/bin/star -C " + targetdir + " " + compress + " -x -v -U -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout"); 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 Thu Jan 29 19:36:15 2009 @@ -25,6 +25,8 @@ import "Popup"; import "Label"; +import "Directory"; +import "String"; /** * This function removes HTML tags from input string @@ -32,8 +34,7 @@ * @return string String without tags */ -define string RemoveTags(string input) ``{ - string ret = input; +define string RemoveTags(string & ret) ``{ map<string,string> tagmapping = $[ "BR" : "\n", "/P" : "\n", "P" : "", "B" : "", "/B" : "", "EM" : "", "/EM" : "", "I" : "", "/I" : "", "TT" : "", "/TT" : "", @@ -42,17 +43,22 @@ "H3" : "", "/H3" : "" ]; + string tag = nil; + string taglower = nil; + foreach(string t, string repl, tagmapping, ``{ - string tag = "<" + t + ">"; + tag = "<" + t + ">"; while (issubstring(ret, tag)) { ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); } - while (issubstring(ret, tolower(tag))) + taglower = tolower(tag); + + while (issubstring(ret, taglower)) { - ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); + ret = regexpsub(ret, "(.*)" + taglower + "(.*)", "\\1" + repl + "\\2"); } } ); @@ -120,7 +126,35 @@ if (savefile != "" && savefile != nil) { - SCR::Write(.target.string, savefile, RemoveTags(detail_text)); + // Create or empty the file + SCR::Write(.target.string, savefile, ""); + + // BNC #460674 + // Due to the very ineffective all-in-one-run function, removing HTML + // and writing thw whole file at once takes just too much time + // + // Fixed by going through the summary line by line (by <BR>s) + + string tmpfile = Directory::tmpdir + "/restore_tmpfile"; + + y2milestone ("Using tmpfile: %1", tmpfile); + // Using tmpfile - there are more powerful tools for parsing text + 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 + ) { + detail_text = (string) SCR::Read (.target.string, tmpfile); + } + } + + foreach (string one_line, splitstring (detail_text, "\n"), { + // <BR> == newline + one_line = one_line + "\n"; + // Appending lines one by one + SCR::Write (.backup.file_append, [savefile, RemoveTags (one_line)]); + }); + y2milestone("Summary saved to file: %1", savefile); } } -- 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] r55154 - /tags/stable-2_18_3/storage/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 17:41:04 2009 New Revision: 55154 URL: http://svn.opensuse.org/viewcvs/yast?rev=55154&view=rev Log: Created tag stable-2_18_3 for storage Added: tags/stable-2_18_3/storage/ (props changed) - copied from r55153, trunk/storage/ -- 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] r55153 - /tags/stable-2_18_3/core/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 17:28:41 2009 New Revision: 55153 URL: http://svn.opensuse.org/viewcvs/yast?rev=55153&view=rev Log: Created tag stable-2_18_3 for core Added: tags/stable-2_18_3/core/ (props changed) - copied from r55152, trunk/core/ -- 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] r55152 - /tags/branch-Code-11-2_17_69/storage/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 17:09:33 2009 New Revision: 55152 URL: http://svn.opensuse.org/viewcvs/yast?rev=55152&view=rev Log: Created tag branch-Code-11-2_17_69 for storage Added: tags/branch-Code-11-2_17_69/storage/ - copied from r55151, branches/SuSE-Code-11-Branch/storage/ -- 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] r55151 - /tags/branch-Code-11-2_17_69/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 17:09:32 2009 New Revision: 55151 URL: http://svn.opensuse.org/viewcvs/yast?rev=55151&view=rev Log: Created tag branch-Code-11-2_17_69 Added: tags/branch-Code-11-2_17_69/ -- 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] r55150 - /tags/branch-Code-11-2_17_28/core/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 17:09:26 2009 New Revision: 55150 URL: http://svn.opensuse.org/viewcvs/yast?rev=55150&view=rev Log: Created tag branch-Code-11-2_17_28 for core Added: tags/branch-Code-11-2_17_28/core/ (props changed) - copied from r55149, branches/SuSE-Code-11-Branch/core/ -- 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] r55149 - in /branches/SuSE-Code-11-Branch/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 16:30:05 2009 New Revision: 55149 URL: http://svn.opensuse.org/viewcvs/yast?rev=55149&view=rev Log: - changed method to disable automounter (since "overnight" GNOME does not support the old method anymore) (bnc #464453) Modified: branches/SuSE-Code-11-Branch/storage/VERSION branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp branches/SuSE-Code-11-Branch/storage/yast2-storage.spec.in Modified: branches/SuSE-Code-11-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/V… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-Branch/storage/VERSION Thu Jan 29 16:30:05 2009 @@ -1 +1 @@ -2.17.68 +2.17.69 Modified: branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/p… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-Branch/storage/package/yast2-storage.changes Thu Jan 29 16:30:05 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 15:22:35 CET 2009 - aschnell(a)suse.de + +- changed method to disable automounter (since "overnight" GNOME + does not support the old method anymore) (bnc #464453) +- 2.17.69 + +------------------------------------------------------------------- Mon Jan 26 12:22:36 CET 2009 - aschnell(a)suse.de - fixed udev partition postfix for dm based devices (bnc #468786) Modified: branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/s… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-Branch/storage/storage/src/modules/Storage.ycp Thu Jan 29 16:30:05 2009 @@ -6371,18 +6371,35 @@ y2milestone( "AddHwPackage list:%1", hw_packages ); } -global void SwitchUiAutomounter( boolean on ) + +global void SwitchUiAutomounter(boolean on) +{ + y2milestone("SwitchUiAutomounter on:%1", on); + + if (!on) + { + SCR::Execute(.dbus.method, + $[ `destination : "org.freedesktop.Hal", + `path : "/org/freedesktop/Hal/Manager", + `interface : "org.freedesktop.Hal.Manager", + `method : "AcquireGlobalInterfaceLock" ], + [ "org.freedesktop.Hal.Device.Storage", + true ]); + } + else { - y2milestone( "SwitchUiAutomounter on:%1", on ); - string cmd = "hal-set-property " + - "--udi /org/freedesktop/Hal/devices/computer " + - "--key storage.disable_volume_handling --bool "; - cmd = cmd + (on?"true":"false" ); - y2milestone( "SwitchUiAutomounter cmd %1", cmd ); - SCR::Execute( .target.bash, cmd ); - y2milestone( "SwitchUiAutomounter exit" ); + SCR::Execute(.dbus.method, + $[ `destination : "org.freedesktop.Hal", + `path : "/org/freedesktop/Hal/Manager", + `interface : "org.freedesktop.Hal.Manager", + `method : "ReleaseGlobalInterfaceLock" ], + [ "org.freedesktop.Hal.Device.Storage" ]); } + y2milestone("SwitchUiAutomounter exit"); +} + + global void DumpObjectList() { if (!InitLibstorage(false)) Modified: branches/SuSE-Code-11-Branch/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/storage/y… ============================================================================== --- branches/SuSE-Code-11-Branch/storage/yast2-storage.spec.in (original) +++ branches/SuSE-Code-11-Branch/storage/yast2-storage.spec.in Thu Jan 29 16:30:05 2009 @@ -4,7 +4,7 @@ @HEADER@ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup -Requires: yast2-core >= 2.17.10 +Requires: yast2-core >= 2.17.28 Requires: yast2 >= 2.17.45 Requires: yast2-libyui >= 2.17.5 %ifarch s390 s390x -- 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] r55148 - in /branches/SuSE-Code-11-Branch/core: ./ agent-dbus/ agent-dbus/conf/ agent-dbus/doc/ agent-dbus/src/ package/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 16:29:36 2009 New Revision: 55148 URL: http://svn.opensuse.org/viewcvs/yast?rev=55148&view=rev Log: - added dbus client agent (required for bnc #464453) Added: branches/SuSE-Code-11-Branch/core/agent-dbus/ branches/SuSE-Code-11-Branch/core/agent-dbus/Makefile.am branches/SuSE-Code-11-Branch/core/agent-dbus/conf/ branches/SuSE-Code-11-Branch/core/agent-dbus/conf/Makefile.am branches/SuSE-Code-11-Branch/core/agent-dbus/conf/dbus.scr branches/SuSE-Code-11-Branch/core/agent-dbus/doc/ branches/SuSE-Code-11-Branch/core/agent-dbus/doc/Makefile.am branches/SuSE-Code-11-Branch/core/agent-dbus/src/ branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.cc branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.h branches/SuSE-Code-11-Branch/core/agent-dbus/src/Makefile.am branches/SuSE-Code-11-Branch/core/agent-dbus/src/Y2CCDbusAgent.cc Modified: branches/SuSE-Code-11-Branch/core/SUBDIRS branches/SuSE-Code-11-Branch/core/VERSION branches/SuSE-Code-11-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-Branch/core/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/SUBD… ============================================================================== --- branches/SuSE-Code-11-Branch/core/SUBDIRS (original) +++ branches/SuSE-Code-11-Branch/core/SUBDIRS Thu Jan 29 16:29:36 2009 @@ -1 +1 @@ -liby2util-r liby2 libycp liby2dbus libscr agent-dummy scr agent-system agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs dbus +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 Modified: branches/SuSE-Code-11-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/VERS… ============================================================================== --- branches/SuSE-Code-11-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-Branch/core/VERSION Thu Jan 29 16:29:36 2009 @@ -1 +1 @@ -2.17.27 +2.17.28 Added: branches/SuSE-Code-11-Branch/core/agent-dbus/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/Makefile.am Thu Jan 29 16:29:36 2009 @@ -0,0 +1,5 @@ +# +# Makefile.am for core/agent-dbus +# + +SUBDIRS = conf doc src Added: branches/SuSE-Code-11-Branch/core/agent-dbus/conf/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/conf/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/conf/Makefile.am Thu Jan 29 16:29:36 2009 @@ -0,0 +1,7 @@ +# +# Makefile.am for core/agent-dbus/conf +# + +scrconf_DATA = dbus.scr + +EXTRA_DIST = $(scrconf_DATA) Added: branches/SuSE-Code-11-Branch/core/agent-dbus/conf/dbus.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/conf/dbus.scr (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/conf/dbus.scr Thu Jan 29 16:29:36 2009 @@ -0,0 +1,9 @@ +/** + * File: + * dbus.scr + * Authors: + * Arvin Schnell <aschnell(a)suse.de> + */ +.dbus + +`ag_dbus() Added: branches/SuSE-Code-11-Branch/core/agent-dbus/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/doc/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/doc/Makefile.am Thu Jan 29 16:29:36 2009 @@ -0,0 +1,16 @@ +# +# Makefile.am for core/agent-dbus/doc +# + +SUBDIRS = + +builtin = $(srcdir)/../src/DbusAgent.cc +hbuiltin = ag_dbus.html +$(hbuiltin): $(builtin) + `pkg-config --variable=ybindir yast2-devtools`/makebuiltindocs -t "SCR Dbus agent functions" -a $(builtin) > $@.new + mv $@.new $@ + +compdir = $(yastdocdir)/components +comp_DATA = $(hbuiltin) + +CLEANFILES = $(hbuiltin) Added: branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.cc (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.cc Thu Jan 29 16:29:36 2009 @@ -0,0 +1,187 @@ +/* + * File: DbusAgent.cc + * + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ + +#include "config.h" + +#include <YCP.h> +#include <ycp/y2log.h> + +#include "DbusAgent.h" + + +DbusAgent::DbusAgent() +{ + 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"); + } +} + + +DbusAgent::~DbusAgent() +{ +} + + +YCPValue +DbusAgent::Read(const YCPPath& path, const YCPValue& arg, const YCPValue&) +{ + y2debug("Read(%s)", path->toString().c_str()); + + if (path->isRoot()) + { + ycp2error("Read() called without sub-path"); + return YCPNull(); + } + + const string cmd = path->component_str(0); // just a shortcut + + return YCPError(string("Undefined subpath for Read(") + path->toString() + ")"); +} + + +YCPBoolean +DbusAgent::Write(const YCPPath& path, const YCPValue& value, + const YCPValue& arg) +{ + y2debug("Write(%s)", path->toString().c_str()); + + if (path->isRoot()) + { + ycp2error("Write() called without sub-path"); + return YCPBoolean(false); + } + + const string cmd = path->component_str(0); // just a shortcut + + ycp2error("Undefined subpath for Write(%s)", path->toString ().c_str ()); + return YCPBoolean(false); +} + + +YCPValue +DbusAgent::Execute(const YCPPath& path, const YCPValue& value, + const YCPValue& arg) +{ + y2debug("Execute(%s)", path->toString().c_str()); + + if (path->isRoot()) + { + return YCPError("Execute() called without sub-path"); + } + + if (value.isNull()) + { + return YCPError(string("Execute(")+path->toString()+") without argument."); + } + + const string cmd = path->component_str(0); // just a shortcut + + if (cmd == "method") + { + /** + * @builtin Execute(.dbus.method, map params, list args) -> boolean + * + * params must contain parameters for dbus_message_new_method_call() + * and args must contain arguments for dbus method call. + */ + + if (!connection) + return YCPError("dbus connection failed"); + + if (!value->isMap()) + return YCPError("value not a map"); + + if (!arg->isList()) + return YCPError("arg not a list"); + + YCPMap tmp1 = value->asMap(); + + YCPValue destination = tmp1.value(YCPSymbol("destination")); + if (!destination->isString()) + return YCPError("Missing or wrong type for 'destination'"); + + YCPValue path = tmp1.value(YCPSymbol("path")); + if (!path->isString()) + return YCPError("Missing or wrong type for 'path'"); + + YCPValue interface = tmp1.value(YCPSymbol("interface")); + if (!interface->isString()) + return YCPError("Missing or wrong type for 'interface'"); + + YCPValue method = tmp1.value(YCPSymbol("method")); + if (!method->isString()) + return YCPError("Missing or wrong type for 'method'"); + + DBusMessage* message = dbus_message_new_method_call(destination->asString()->value_cstr(), + path->asString()->value_cstr(), + interface->asString()->value_cstr(), + method->asString()->value_cstr()); + if (NULL == message) + { + return YCPError("dbus_message_new_method_call() failed"); + } + + DBusMessageIter args; + + dbus_message_iter_init_append(message, &args); + + YCPList tmp2 = arg->asList(); + for (YCPListIterator it = tmp2.begin(); it != tmp2.end(); ++it) + { + const YCPValue& tmp3 = *it; + + if (tmp3->isString()) + { + const char* param = tmp3->asString()->value_cstr(); + if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &param)) + return YCPError("dbus_message_iter_append_basic() failed"); + } + else if (tmp3->isBoolean()) + { + bool param = tmp3->asBoolean()->value(); + if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &param)) + return YCPError("dbus_message_iter_append_basic() failed"); + } + else + { + return YCPError("Unsupported type"); + } + } + + DBusMessage* reply = dbus_connection_send_with_reply_and_block(connection, message, -1, &error); + + dbus_message_unref(message); + + if (dbus_error_is_set(&error)) + { + dbus_error_free(&error); + return YCPError("dbus_connection_send_with_reply_and_block() failed"); + } + + if (reply == NULL) + { + return YCPError("dbus_connection_send_with_reply_and_block() failed"); + } + + dbus_message_unref(reply); + + return YCPBoolean(true); + } + + return YCPError(string("Undefined subpath for Execute(") + path->toString() + ")"); +} Added: branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.h (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/src/DbusAgent.h Thu Jan 29 16:29:36 2009 @@ -0,0 +1,63 @@ +/* + * File: DbusAgent.h + * + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ + +#ifndef DbusAgent_h +#define DbusAgent_h + + +#include <dbus/dbus.h> + +#include <ycp/YCPValue.h> +#include <scr/SCRAgent.h> + + +/** + * @short SCR Agent for DBus commands. + * + * aschnell: WARNING: This agent was written in a hurry for exactly one single + * purpose (acquire global HAL interface lock). Likely use for other commands + * is not possible but I'm confident the agent can be extended at the + * sacrifice of changing the API. + */ +class DbusAgent : public SCRAgent +{ + +public: + + DbusAgent(); + ~DbusAgent(); + + /** + * Read data + */ + virtual YCPValue Read(const YCPPath& path, const YCPValue& arg = YCPNull(), const YCPValue& opt = YCPNull()); + + /** + * Write data + */ + virtual YCPBoolean Write(const YCPPath& path, const YCPValue& value, + const YCPValue& arg = YCPNull()); + + /** + * Execute a command + */ + virtual YCPValue Execute(const YCPPath& path, const YCPValue& value = YCPNull(), + const YCPValue& arg = YCPNull()); + + /** + * Get a list of all subtrees + */ + virtual YCPList Dir(const YCPPath& path) { return YCPList(); } + +private: + + DBusConnection* connection; + DBusError error; + +}; + + +#endif // DbusAgent_h Added: branches/SuSE-Code-11-Branch/core/agent-dbus/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/src/Makefile.am (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/src/Makefile.am Thu Jan 29 16:29:36 2009 @@ -0,0 +1,18 @@ +# +# Makefile.am for core/agent-dbus/src +# + +AM_CXXFLAGS = -DY2LOG=\"agent-dbus\" + +plugin_LTLIBRARIES = libpy2ag_dbus.la + +libpy2ag_dbus_la_SOURCES = \ + Y2CCDbusAgent.cc \ + DbusAgent.cc DbusAgent.h + +libpy2ag_dbus_la_CPPFLAGS = @DBUS_CFLAGS@ +libpy2ag_dbus_la_LDFLAGS = -version-info 2:0 +libpy2ag_dbus_la_LIBADD = @AGENT_LIBADD@ \ + @DBUS_LIBS@ + +INCLUDES = @AGENT_INCLUDES@ Added: branches/SuSE-Code-11-Branch/core/agent-dbus/src/Y2CCDbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/agen… ============================================================================== --- branches/SuSE-Code-11-Branch/core/agent-dbus/src/Y2CCDbusAgent.cc (added) +++ branches/SuSE-Code-11-Branch/core/agent-dbus/src/Y2CCDbusAgent.cc Thu Jan 29 16:29:36 2009 @@ -0,0 +1,17 @@ + + +/* + * Author: Arvin Schnell <aschnell(a)suse.de> + */ + + +#include <scr/Y2AgentComponent.h> +#include <scr/Y2CCAgentComponent.h> + +#include "DbusAgent.h" + + +typedef Y2AgentComp<DbusAgent> Y2DbusAgentComp; + +Y2CCAgentComp<Y2DbusAgentComp> g_y2ccag_dbus("ag_dbus"); + Modified: branches/SuSE-Code-11-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/core/pack… ============================================================================== --- branches/SuSE-Code-11-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-Branch/core/package/yast2-core.changes Thu Jan 29 16:29:36 2009 @@ -1,8 +1,14 @@ ------------------------------------------------------------------- +Thu Jan 29 15:15:57 CET 2009 - aschnell(a)suse.de + +- added dbus client agent (required for bnc #464453) +- 2.17.28 + +------------------------------------------------------------------- Mon Jan 26 14:00:31 CET 2009 - mvidner(a)suse.cz - Fixed the D-Bus access policy (bnc#468390, CVE-2008-4311). -- 2.18.27 +- 2.17.27 ------------------------------------------------------------------- Mon Dec 22 13:16:02 CET 2008 - mvidner(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] r55147 - in /trunk/storage: VERSION package/yast2-storage.changes storage/src/modules/Storage.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 15:28:09 2009 New Revision: 55147 URL: http://svn.opensuse.org/viewcvs/yast?rev=55147&view=rev Log: - changed method to disable automounter (since "overnight" GNOME does not support the old method anymore) (bnc #464453) Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=55147&r1=551… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Thu Jan 29 15:28:09 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Jan 29 15:28:09 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 15:22:35 CET 2009 - aschnell(a)suse.de + +- changed method to disable automounter (since "overnight" GNOME + does not support the old method anymore) (bnc #464453) +- 2.18.3 + +------------------------------------------------------------------- Tue Jan 27 10:38:28 CET 2009 - aschnell(a)suse.de - make "Installation Summary" directly accessible in expert 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 Thu Jan 29 15:28:09 2009 @@ -6376,18 +6376,35 @@ y2milestone( "AddHwPackage list:%1", hw_packages ); } -global void SwitchUiAutomounter( boolean on ) + +global void SwitchUiAutomounter(boolean on) +{ + y2milestone("SwitchUiAutomounter on:%1", on); + + if (!on) + { + SCR::Execute(.dbus.method, + $[ `destination : "org.freedesktop.Hal", + `path : "/org/freedesktop/Hal/Manager", + `interface : "org.freedesktop.Hal.Manager", + `method : "AcquireGlobalInterfaceLock" ], + [ "org.freedesktop.Hal.Device.Storage", + true ]); + } + else { - y2milestone( "SwitchUiAutomounter on:%1", on ); - string cmd = "hal-set-property " + - "--udi /org/freedesktop/Hal/devices/computer " + - "--key storage.disable_volume_handling --bool "; - cmd = cmd + (on?"true":"false" ); - y2milestone( "SwitchUiAutomounter cmd %1", cmd ); - SCR::Execute( .target.bash, cmd ); - y2milestone( "SwitchUiAutomounter exit" ); + SCR::Execute(.dbus.method, + $[ `destination : "org.freedesktop.Hal", + `path : "/org/freedesktop/Hal/Manager", + `interface : "org.freedesktop.Hal.Manager", + `method : "ReleaseGlobalInterfaceLock" ], + [ "org.freedesktop.Hal.Device.Storage" ]); } + y2milestone("SwitchUiAutomounter exit"); +} + + global void DumpObjectList() { if (!InitLibstorage(false)) Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Thu Jan 29 15:28:09 2009 @@ -6,7 +6,7 @@ BuildRequires: update-desktop-files yast2 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite yast2-perl-bindings Requires: yast2-storage-lib = %version yast2-perl-bindings parted mdadm lvm2 dmraid -Requires: multipath-tools kpartx cryptsetup yast2-core >= 2.18.1 yast2 >= 2.18.3 +Requires: multipath-tools kpartx cryptsetup yast2-core >= 2.18.3 yast2 >= 2.18.3 Requires: yast2-libyui >= 2.17.5 %ifarch s390 s390x Requires: yast2-s390 -- 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] r55146 - in /trunk/core: ./ agent-dbus/ agent-dbus/conf/ agent-dbus/doc/ agent-dbus/src/ package/
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 15:19:24 2009 New Revision: 55146 URL: http://svn.opensuse.org/viewcvs/yast?rev=55146&view=rev Log: - added dbus client agent (required for bnc #464453) Added: trunk/core/agent-dbus/ (with props) trunk/core/agent-dbus/Makefile.am trunk/core/agent-dbus/conf/ (with props) trunk/core/agent-dbus/conf/Makefile.am trunk/core/agent-dbus/conf/dbus.scr trunk/core/agent-dbus/doc/ (with props) trunk/core/agent-dbus/doc/Makefile.am trunk/core/agent-dbus/src/ (with props) trunk/core/agent-dbus/src/DbusAgent.cc trunk/core/agent-dbus/src/DbusAgent.h trunk/core/agent-dbus/src/Makefile.am trunk/core/agent-dbus/src/Y2CCDbusAgent.cc Modified: trunk/core/SUBDIRS trunk/core/VERSION trunk/core/package/yast2-core.changes Modified: trunk/core/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/SUBDIRS?rev=55146&r1=55145&… ============================================================================== --- trunk/core/SUBDIRS (original) +++ trunk/core/SUBDIRS Thu Jan 29 15:19:24 2009 @@ -1 +1 @@ -liby2util-r liby2 libycp liby2dbus libscr agent-dummy scr agent-system agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs dbus +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 Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=55146&r1=55145&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Thu Jan 29 15:19:24 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Added: trunk/core/agent-dbus/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/Makefile.am?rev=… ============================================================================== --- trunk/core/agent-dbus/Makefile.am (added) +++ trunk/core/agent-dbus/Makefile.am Thu Jan 29 15:19:24 2009 @@ -0,0 +1,5 @@ +# +# Makefile.am for core/agent-dbus +# + +SUBDIRS = conf doc src Added: 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 (added) +++ trunk/core/agent-dbus/conf/Makefile.am Thu Jan 29 15:19:24 2009 @@ -0,0 +1,7 @@ +# +# Makefile.am for core/agent-dbus/conf +# + +scrconf_DATA = dbus.scr + +EXTRA_DIST = $(scrconf_DATA) Added: trunk/core/agent-dbus/conf/dbus.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/conf/dbus.scr?re… ============================================================================== --- trunk/core/agent-dbus/conf/dbus.scr (added) +++ trunk/core/agent-dbus/conf/dbus.scr Thu Jan 29 15:19:24 2009 @@ -0,0 +1,9 @@ +/** + * File: + * dbus.scr + * Authors: + * Arvin Schnell <aschnell(a)suse.de> + */ +.dbus + +`ag_dbus() Added: trunk/core/agent-dbus/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/doc/Makefile.am?… ============================================================================== --- trunk/core/agent-dbus/doc/Makefile.am (added) +++ trunk/core/agent-dbus/doc/Makefile.am Thu Jan 29 15:19:24 2009 @@ -0,0 +1,16 @@ +# +# Makefile.am for core/agent-dbus/doc +# + +SUBDIRS = + +builtin = $(srcdir)/../src/DbusAgent.cc +hbuiltin = ag_dbus.html +$(hbuiltin): $(builtin) + `pkg-config --variable=ybindir yast2-devtools`/makebuiltindocs -t "SCR Dbus agent functions" -a $(builtin) > $@.new + mv $@.new $@ + +compdir = $(yastdocdir)/components +comp_DATA = $(hbuiltin) + +CLEANFILES = $(hbuiltin) Added: 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 (added) +++ trunk/core/agent-dbus/src/DbusAgent.cc Thu Jan 29 15:19:24 2009 @@ -0,0 +1,187 @@ +/* + * File: DbusAgent.cc + * + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ + +#include "config.h" + +#include <YCP.h> +#include <ycp/y2log.h> + +#include "DbusAgent.h" + + +DbusAgent::DbusAgent() +{ + 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"); + } +} + + +DbusAgent::~DbusAgent() +{ +} + + +YCPValue +DbusAgent::Read(const YCPPath& path, const YCPValue& arg, const YCPValue&) +{ + y2debug("Read(%s)", path->toString().c_str()); + + if (path->isRoot()) + { + ycp2error("Read() called without sub-path"); + return YCPNull(); + } + + const string cmd = path->component_str(0); // just a shortcut + + return YCPError(string("Undefined subpath for Read(") + path->toString() + ")"); +} + + +YCPBoolean +DbusAgent::Write(const YCPPath& path, const YCPValue& value, + const YCPValue& arg) +{ + y2debug("Write(%s)", path->toString().c_str()); + + if (path->isRoot()) + { + ycp2error("Write() called without sub-path"); + return YCPBoolean(false); + } + + const string cmd = path->component_str(0); // just a shortcut + + ycp2error("Undefined subpath for Write(%s)", path->toString ().c_str ()); + return YCPBoolean(false); +} + + +YCPValue +DbusAgent::Execute(const YCPPath& path, const YCPValue& value, + const YCPValue& arg) +{ + y2debug("Execute(%s)", path->toString().c_str()); + + if (path->isRoot()) + { + return YCPError("Execute() called without sub-path"); + } + + if (value.isNull()) + { + return YCPError(string("Execute(")+path->toString()+") without argument."); + } + + const string cmd = path->component_str(0); // just a shortcut + + if (cmd == "method") + { + /** + * @builtin Execute(.dbus.method, map params, list args) -> boolean + * + * params must contain parameters for dbus_message_new_method_call() + * and args must contain arguments for dbus method call. + */ + + if (!connection) + return YCPError("dbus connection failed"); + + if (!value->isMap()) + return YCPError("value not a map"); + + if (!arg->isList()) + return YCPError("arg not a list"); + + YCPMap tmp1 = value->asMap(); + + YCPValue destination = tmp1.value(YCPSymbol("destination")); + if (!destination->isString()) + return YCPError("Missing or wrong type for 'destination'"); + + YCPValue path = tmp1.value(YCPSymbol("path")); + if (!path->isString()) + return YCPError("Missing or wrong type for 'path'"); + + YCPValue interface = tmp1.value(YCPSymbol("interface")); + if (!interface->isString()) + return YCPError("Missing or wrong type for 'interface'"); + + YCPValue method = tmp1.value(YCPSymbol("method")); + if (!method->isString()) + return YCPError("Missing or wrong type for 'method'"); + + DBusMessage* message = dbus_message_new_method_call(destination->asString()->value_cstr(), + path->asString()->value_cstr(), + interface->asString()->value_cstr(), + method->asString()->value_cstr()); + if (NULL == message) + { + return YCPError("dbus_message_new_method_call() failed"); + } + + DBusMessageIter args; + + dbus_message_iter_init_append(message, &args); + + YCPList tmp2 = arg->asList(); + for (YCPList::const_iterator it = tmp2.begin(); it != tmp2.end(); ++it) + { + const YCPValue& tmp3 = *it; + + if (tmp3->isString()) + { + const char* param = tmp3->asString()->value_cstr(); + if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &param)) + return YCPError("dbus_message_iter_append_basic() failed"); + } + else if (tmp3->isBoolean()) + { + bool param = tmp3->asBoolean()->value(); + if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &param)) + return YCPError("dbus_message_iter_append_basic() failed"); + } + else + { + return YCPError("Unsupported type"); + } + } + + DBusMessage* reply = dbus_connection_send_with_reply_and_block(connection, message, -1, &error); + + dbus_message_unref(message); + + if (dbus_error_is_set(&error)) + { + dbus_error_free(&error); + return YCPError("dbus_connection_send_with_reply_and_block() failed"); + } + + if (reply == NULL) + { + return YCPError("dbus_connection_send_with_reply_and_block() failed"); + } + + dbus_message_unref(reply); + + return YCPBoolean(true); + } + + return YCPError(string("Undefined subpath for Execute(") + path->toString() + ")"); +} Added: 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 (added) +++ trunk/core/agent-dbus/src/DbusAgent.h Thu Jan 29 15:19:24 2009 @@ -0,0 +1,63 @@ +/* + * File: DbusAgent.h + * + * Authors: Arvin Schnell <aschnell(a)suse.de> + */ + +#ifndef DbusAgent_h +#define DbusAgent_h + + +#include <dbus/dbus.h> + +#include <ycp/YCPValue.h> +#include <scr/SCRAgent.h> + + +/** + * @short SCR Agent for DBus commands. + * + * aschnell: WARNING: This agent was written in a hurry for exactly one single + * purpose (acquire global HAL interface lock). Likely use for other commands + * is not possible but I'm confident the agent can be extended at the + * sacrifice of changing the API. + */ +class DbusAgent : public SCRAgent +{ + +public: + + DbusAgent(); + ~DbusAgent(); + + /** + * Read data + */ + virtual YCPValue Read(const YCPPath& path, const YCPValue& arg = YCPNull(), const YCPValue& opt = YCPNull()); + + /** + * Write data + */ + virtual YCPBoolean Write(const YCPPath& path, const YCPValue& value, + const YCPValue& arg = YCPNull()); + + /** + * Execute a command + */ + virtual YCPValue Execute(const YCPPath& path, const YCPValue& value = YCPNull(), + const YCPValue& arg = YCPNull()); + + /** + * Get a list of all subtrees + */ + virtual YCPList Dir(const YCPPath& path) { return YCPList(); } + +private: + + DBusConnection* connection; + DBusError error; + +}; + + +#endif // DbusAgent_h Added: trunk/core/agent-dbus/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/Makefile.am?… ============================================================================== --- trunk/core/agent-dbus/src/Makefile.am (added) +++ trunk/core/agent-dbus/src/Makefile.am Thu Jan 29 15:19:24 2009 @@ -0,0 +1,18 @@ +# +# Makefile.am for core/agent-dbus/src +# + +AM_CXXFLAGS = -DY2LOG=\"agent-dbus\" + +plugin_LTLIBRARIES = libpy2ag_dbus.la + +libpy2ag_dbus_la_SOURCES = \ + Y2CCDbusAgent.cc \ + DbusAgent.cc DbusAgent.h + +libpy2ag_dbus_la_CPPFLAGS = @DBUS_CFLAGS@ +libpy2ag_dbus_la_LDFLAGS = -version-info 2:0 +libpy2ag_dbus_la_LIBADD = @AGENT_LIBADD@ \ + @DBUS_LIBS@ + +INCLUDES = @AGENT_INCLUDES@ Added: trunk/core/agent-dbus/src/Y2CCDbusAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-dbus/src/Y2CCDbusAgen… ============================================================================== --- trunk/core/agent-dbus/src/Y2CCDbusAgent.cc (added) +++ trunk/core/agent-dbus/src/Y2CCDbusAgent.cc Thu Jan 29 15:19:24 2009 @@ -0,0 +1,17 @@ + + +/* + * Author: Arvin Schnell <aschnell(a)suse.de> + */ + + +#include <scr/Y2AgentComponent.h> +#include <scr/Y2CCAgentComponent.h> + +#include "DbusAgent.h" + + +typedef Y2AgentComp<DbusAgent> Y2DbusAgentComp; + +Y2CCAgentComp<Y2DbusAgentComp> g_y2ccag_dbus("ag_dbus"); + Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Thu Jan 29 15:19:24 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 29 15:15:57 CET 2009 - aschnell(a)suse.de + +- added dbus client agent (required for bnc #464453) +- 2.18.3 + +------------------------------------------------------------------- Mon Jan 26 14:00:31 CET 2009 - mvidner(a)suse.cz - Fixed the D-Bus access policy (bnc#468390, CVE-2008-4311). -- 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] r55145 - in /trunk/network: package/yast2-network.changes src/modules/Proxy.ycp src/services/proxy.ycp
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 12:09:27 2009 New Revision: 55145 URL: http://svn.opensuse.org/viewcvs/yast?rev=55145&view=rev Log: Notify user about the need to relogin on finishing proxy configuration Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp trunk/network/src/services/proxy.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jan 29 12:09:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jan 29 11:59:48 CET 2009 - kmachalkova(a)suse.cz + +- Proxy finish popup is back - notify user about the need to relogin + to apply new settings (bnc#458708) + +------------------------------------------------------------------- Mon Jan 26 13:30:16 CET 2009 - mzugec(a)suse.cz - lan : button labeling (bnc#440551) Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Thu Jan 29 12:09:27 2009 @@ -40,17 +40,13 @@ /** * Display popup at the end of the proxy configuration * @param modified true if proxy settings have been modified + */ define void ProxyFinishPopup(boolean modified) ``{ -string text = _("Applications that support it, such as YaST2 Online Update, -use them immediately. Other applications use them after a new login -(lynx, wget). Some applications do not support these settings at all -- -they use their own settings system. -"); +string text = _("It is recommended to relogin to make new proxy settings effective."); FinishPopup(modified, "proxy", text, "", []); } - */ /** * Read settings @@ -172,8 +168,8 @@ sleep(sl); Progress::NextStage(); - /*if (!Mode::config ()) - ProxyFinishPopup(true); */ + if (!Mode::config ()) + ProxyFinishPopup(true); /* Update /root/.wgetrc */ /* YOU uses curl(1) Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?r… ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Thu Jan 29 12:09:27 2009 @@ -287,7 +287,9 @@ /* Proxy dialog help 1/8 */ string help = _("<p>Configure your Internet proxy (caching) settings here.</p> -<p><b>Note:</b> In some cases you may need to relogin for the settings to take effect</p>") + +<p><b>Note:</b> It is generally recommended to relogin for the settings to take effect, +however in some cases the application may pick up new settings immediately. Please check +what your application (web browser, ftp client,...) supports. </p>") + /* Proxy dialog help 2/8 */ _("<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access -- 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] r55144 - /trunk/autoinstallation/doc/autoyast.xml
by ug＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: ug Date: Thu Jan 29 12:08:43 2009 New Revision: 55144 URL: http://svn.opensuse.org/viewcvs/yast?rev=55144&view=rev Log: *LOL* Modified: trunk/autoinstallation/doc/autoyast.xml Modified: trunk/autoinstallation/doc/autoyast.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/autoyast.xm… ============================================================================== --- trunk/autoinstallation/doc/autoyast.xml (original) +++ trunk/autoinstallation/doc/autoyast.xml Thu Jan 29 12:08:43 2009 @@ -59,7 +59,7 @@ <surname>Gansert</surname> <affiliation> <jobtitle>Server Technologies</jobtitle> - <orgname> &company-suse; Linux Products GmbH</orgname> + <orgname></orgname> </affiliation> </author> </authorgroup> -- 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] r55143 - in /trunk/qt-pkg: ./ cmake/ package/ src/ src/icons/
by sh-sh-sh＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: sh-sh-sh Date: Thu Jan 29 12:05:23 2009 New Revision: 55143 URL: http://svn.opensuse.org/viewcvs/yast?rev=55143&view=rev Log: merged tabbed-pkg-browsing branch Added: trunk/qt-pkg/src/YQPkgFilterTab.cc - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.cc trunk/qt-pkg/src/YQPkgFilterTab.h - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgFilterTab.h trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgPackageKitGroupsFilterView.cc trunk/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/YQPkgPackageKitGroupsFilterView.h trunk/qt-pkg/src/icons/tab_remove.xpm - copied unchanged from r55087, branches/tmp/sh/tabbed-pkg-browsing/qt-pkg/src/icons/tab_remove.xpm Modified: trunk/qt-pkg/ (props changed) trunk/qt-pkg/CMakeLists.txt (props changed) trunk/qt-pkg/MAINTAINER (props changed) trunk/qt-pkg/Makefile.cvs (props changed) trunk/qt-pkg/VERSION.cmake (contents, props changed) trunk/qt-pkg/cmake/ (props changed) trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/ (props changed) trunk/qt-pkg/src/CMakeLists.txt trunk/qt-pkg/src/YQIconPool.cc trunk/qt-pkg/src/YQIconPool.h trunk/qt-pkg/src/YQPackageSelector.cc trunk/qt-pkg/src/YQPackageSelector.h trunk/qt-pkg/src/YQPackageSelectorPluginImpl.cc (props changed) trunk/qt-pkg/src/YQPackageSelectorPluginImpl.h (props changed) trunk/qt-pkg/src/YQPkgPatchList.cc trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=55143&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Thu Jan 29 12:05:23 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Jan 29 12:05:23 2009 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jan 29 11:59:13 CET 2009 - sh(a)suse.de + +- Use tabs instead of combo box for switching filter views + See also: + http://preview.tinyurl.com/tabbed-pkg-browsing + http://preview.tinyurl.com/tabbed-pkg-browsing-follow-up +- Moved PackageKit package groups filter view to separate class +- Restored RPM groups filter view +- V 2.18.2 + +------------------------------------------------------------------- Mon Jan 12 14:12:31 CET 2009 - tgoettlicher(a)suse.de - Fixed column widths in patch and language lists (bnc #461177) Modified: trunk/qt-pkg/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/CMakeLists.txt?rev=55… ============================================================================== --- trunk/qt-pkg/src/CMakeLists.txt (original) +++ trunk/qt-pkg/src/CMakeLists.txt Thu Jan 29 12:05:23 2009 @@ -32,10 +32,12 @@ YQPkgDiskUsageList.cc YQPkgDiskUsageWarningDialog.cc YQPkgFileListView.cc + YQPkgFilterTab.cc YQPkgGenericDetailsView.cc YQPkgLangList.cc YQPkgList.cc YQPkgObjList.cc + YQPkgPackageKitGroupsFilterView.cc YQPkgPatchFilterView.cc YQPkgPatchList.cc YQPkgPatternList.cc Modified: trunk/qt-pkg/src/YQIconPool.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.cc?rev=551… ============================================================================== --- trunk/qt-pkg/src/YQIconPool.cc (original) +++ trunk/qt-pkg/src/YQIconPool.cc Thu Jan 29 12:05:23 2009 @@ -16,12 +16,13 @@ /-*/ +#include <qpixmap.h> + #define YUILogComponent "qt-ui" #include "YUILog.h" #include "YQIconPool.h" - #include "icons/autodel.xpm" #include "icons/autodel_disabled.xpm" #include "icons/autoinstall.xpm" @@ -58,8 +59,9 @@ #include "icons/step_current.xpm" #include "icons/step_todo.xpm" #include "icons/step_done.xpm" -//Added by qt3to4: -#include <qpixmap.h> + +#include "icons/tab_remove.xpm" + YQIconPool * YQIconPool::_iconPool = 0; @@ -106,6 +108,8 @@ QPixmap YQIconPool::stepToDo() { return iconPool()->cachedIcon( step_todo_xpm ); } QPixmap YQIconPool::stepDone() { return iconPool()->cachedIcon( step_done_xpm ); } +QPixmap YQIconPool::tabRemove() { return iconPool()->cachedIcon( tab_remove_xpm ); } + YQIconPool * YQIconPool::iconPool() { Modified: trunk/qt-pkg/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQIconPool.h?rev=5514… ============================================================================== --- trunk/qt-pkg/src/YQIconPool.h (original) +++ trunk/qt-pkg/src/YQIconPool.h Thu Jan 29 12:05:23 2009 @@ -69,6 +69,7 @@ static QPixmap stepToDo(); static QPixmap stepDone(); + static QPixmap tabRemove(); protected: Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Thu Jan 29 12:05:23 2009 @@ -1,14 +1,14 @@ /*---------------------------------------------------------------------\ - | | - | __ __ ____ _____ ____ | - | \ \ / /_ _/ ___|_ _|___ \ | - | \ V / _` \___ \ | | __) | | - | | | (_| |___) || | / __/ | - | |_|\__,_|____/ |_| |_____| | - | | - | core system | - | (C) SuSE GmbH | - \----------------------------------------------------------------------/ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ File: YQPackageSelector.cc See also: YQPackageSelectorHelp.cc @@ -26,7 +26,9 @@ #define GLOBAL_UPDATE_CONFIRMATION_THRESHOLD 20 #define ENABLE_SOURCE_RPMS 0 #define BRAINDEAD_LIB_NAMING_SCHEME 1 -#define MARGIN 10 // around the widget +#define MARGIN 6 // around the widget +#define SPACING_BELOW_MENU_BAR 4 +#define SPLITTER_HALF_SPACING 4 #include <fstream> @@ -65,14 +67,16 @@ #include "YQPkgDiskUsageList.h" #include "YQPkgDiskUsageWarningDialog.h" #include "YQPkgFileListView.h" -#include "YQPkgRepoFilterView.h" -#include "YQPkgRepoList.h" +#include "YQPkgFilterTab.h" #include "YQPkgLangList.h" #include "YQPkgList.h" +#include "YQPkgPackageKitGroupsFilterView.h" #include "YQPkgPatchFilterView.h" #include "YQPkgPatchList.h" #include "YQPkgPatternList.h" #include "YQPkgProductDialog.h" +#include "YQPkgRepoFilterView.h" +#include "YQPkgRepoList.h" #include "YQPkgRpmGroupTagsFilterView.h" #include "YQPkgSearchFilterView.h" #include "YQPkgStatusFilterView.h" @@ -80,6 +84,7 @@ #include "YQPkgTextDialog.h" #include "YQPkgUpdateProblemFilterView.h" #include "YQPkgVersionsView.h" + #include "zypp/SysContent.h" #include "zypp/base/String.h" @@ -109,10 +114,11 @@ _showChangesDialog = true; _autoDependenciesAction = 0; _detailsViews = 0; - _diskUsageList = 0; _filters = 0; - _repoFilterView = 0; _langList = 0; + _packageKitGroupsFilterView = 0; + _patchFilterView = 0; + _patchList = 0; _patternList = 0; _pkgChangeLogView = 0; _pkgDependenciesView = 0; @@ -121,20 +127,17 @@ _pkgList = 0; _pkgTechnicalDetailsView = 0; _pkgVersionsView = 0; + _repoFilterView = 0; _rpmGroupTagsFilterView = 0; _searchFilterView = 0; _statusFilterView = 0; _updateProblemFilterView = 0; - _patchFilterView = 0; - _patchList = 0; _excludeDevelPkgs = 0; _excludeDebugInfoPkgs = 0; - if ( onlineUpdateMode() ) yuiMilestone() << "Online update mode" << endl; if ( updateMode() ) yuiMilestone() << "Update mode" << endl; - basicLayout(); addMenus(); // Only after all widgets are created! makeConnections(); @@ -190,8 +193,8 @@ } - if ( _diskUsageList ) - _diskUsageList->updateDiskUsage(); + if ( _filters->diskUsageList() ) + _filters->diskUsageList()->updateDiskUsage(); yuiMilestone() << "PackageSelector init done" << endl; @@ -208,73 +211,39 @@ #endif } + std::string YQPackageSelector::iconPath( const std::string &name, int size ) { - return zypp::str::form("%s/share/icons/hicolor/%dx%d/apps/%s.png", PREFIX, size, size, name.c_str()); + return zypp::str::form("%s/share/icons/hicolor/%dx%d/apps/%s.png", + PREFIX, size, size, name.c_str() ); } + void YQPackageSelector::basicLayout() { QVBoxLayout *layout = new QVBoxLayout(); - layout->setContentsMargins( MARGIN, 0, 0, MARGIN ); - setLayout(layout); - layoutMenuBar(this); - - QSplitter * outer_splitter = new QSplitter( Qt::Horizontal, this ); - Q_CHECK_PTR( outer_splitter ); - - outer_splitter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); - - outer_splitter->setObjectName( "outer_splitter" ); - - layout->addWidget(outer_splitter); - - QWidget * left_pane = layoutLeftPane ( outer_splitter ); - - QWidget * right_pane = layoutRightPane( outer_splitter ); - - outer_splitter->setStretchFactor(outer_splitter->indexOf(left_pane), 0); - outer_splitter->setStretchFactor(outer_splitter->indexOf(right_pane), 1); -} + setLayout( layout ); + layout->setContentsMargins( MARGIN, // left + 0, // top + MARGIN, // right + MARGIN ); // bottom + layout->setSpacing( SPACING_BELOW_MENU_BAR ); + layoutMenuBar( this ); - -QWidget * -YQPackageSelector::layoutLeftPane( QWidget *parent ) -{ - QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); - Q_CHECK_PTR( splitter ); - splitter->setObjectName( "leftpanesplitter" ); - - QWidget * upper_vbox = new QWidget( splitter ); - QVBoxLayout *layout = new QVBoxLayout(upper_vbox); - layout->setContentsMargins( 0, MARGIN, 0, 0 ); - upper_vbox->setLayout(layout); - - Q_CHECK_PTR( upper_vbox ); - layoutFilters( upper_vbox ); - - _diskUsageList = new YQPkgDiskUsageList( splitter ); - - splitter->setStretchFactor(splitter->indexOf(upper_vbox), 1); - splitter->setStretchFactor(splitter->indexOf( _diskUsageList ), 2); - QList<int> sizes; - sizes << height(); - sizes << 0; - splitter->setSizes( sizes ); - - return splitter; + _filters = new YQPkgFilterTab( this ); + YUI_CHECK_NEW( _filters ); + + layout->addWidget( _filters ); + layoutFilters( this ); + layoutRightPane( _filters->rightPane() ); } void YQPackageSelector::layoutFilters( QWidget *parent ) { - _filters = new QY2ComboTabWidget( _( "Fi&lter:" ), parent ); - Q_CHECK_PTR( _filters ); - parent->layout()->addWidget(_filters); - // // Update problem view // @@ -284,9 +253,11 @@ if ( YQPkgUpdateProblemFilterView::haveProblematicPackages() || testMode() ) { - _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent); - Q_CHECK_PTR( _updateProblemFilterView ); - _filters->addPage( _( "Update Problems" ), _updateProblemFilterView ); + _updateProblemFilterView = new YQPkgUpdateProblemFilterView( parent ); + YUI_CHECK_NEW( _updateProblemFilterView ); + _filters->addPage( _( "&Update Problems" ), _updateProblemFilterView, + "update_problems", // internal name + true ); // showAlways } } @@ -300,7 +271,9 @@ || ! zyppPool().empty<zypp::Patch>() #endif ) + { addPatchFilterView(); + } // @@ -310,8 +283,8 @@ if ( ! zyppPool().empty<zypp::Pattern>() || testMode() ) { _patternList = new YQPkgPatternList( parent, true ); - Q_CHECK_PTR( _patternList ); - _filters->addPage( _( "Patterns" ), _patternList ); + YUI_CHECK_NEW( _patternList ); + _filters->addPage( _( "&Patterns" ), _patternList, "patterns" ); connect( _patternList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -328,12 +301,24 @@ // + // PackageKit group view + // + + _packageKitGroupsFilterView = new YQPkgPackageKitGroupsFilterView( parent ); + YUI_CHECK_NEW( _packageKitGroupsFilterView ); + _filters->addPage( _( "Package &Groups" ), _packageKitGroupsFilterView, "package_groups" ); + + connect( this, SIGNAL( loadData() ), + _packageKitGroupsFilterView, SLOT ( filter() ) ); + + + // // RPM group tags view // _rpmGroupTagsFilterView = new YQPkgRpmGroupTagsFilterView( parent ); - Q_CHECK_PTR( _rpmGroupTagsFilterView ); - _filters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); + YUI_CHECK_NEW( _rpmGroupTagsFilterView ); + _filters->addPage( _( "&RPM Groups" ), _rpmGroupTagsFilterView, "rpm_groups" ); connect( this, SIGNAL( loadData() ), _rpmGroupTagsFilterView, SLOT ( filter() ) ); @@ -343,9 +328,9 @@ // Languages view // _langList = new YQPkgLangList( parent ); - Q_CHECK_PTR( _langList ); + YUI_CHECK_NEW( _langList ); - _filters->addPage( _( "Languages" ), _langList ); + _filters->addPage( _( "&Languages" ), _langList, "languages" ); _langList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Ignored ) ); // hor/vert connect( _langList, SIGNAL( statusChanged() ), @@ -360,8 +345,8 @@ // _repoFilterView = new YQPkgRepoFilterView( parent ); - Q_CHECK_PTR( _repoFilterView ); - _filters->addPage( _( "Repositories" ), _repoFilterView ); + YUI_CHECK_NEW( _repoFilterView ); + _filters->addPage( _( "&Repositories" ), _repoFilterView, "repos" ); // @@ -369,50 +354,48 @@ // _searchFilterView = new YQPkgSearchFilterView( parent ); - Q_CHECK_PTR( _searchFilterView ); - _filters->addPage( _( "Search" ), _searchFilterView ); + YUI_CHECK_NEW( _searchFilterView ); + _filters->addPage( _( "S&earch" ), _searchFilterView, "search", + true ); // showAlways - // - // Status change view - // - - _statusFilterView = new YQPkgStatusFilterView( parent ); - Q_CHECK_PTR( _statusFilterView ); - _filters->addPage( _( "Installation Summary" ), _statusFilterView ); - #if 0 // DEBUG - _filters->addPage( _( "Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", 0 ) ); - _filters->addPage( _( "MIME Types" ), new QLabel( "MIME Types\nfilter\n\nfor future use" , 0 ) ); + _filters->addPage( _( "&Keywords" ), new QLabel( "Keywords\nfilter\n\nfor future use", this ), "keywords" ); #endif + // + // Status change view + // + + _statusFilterView = new YQPkgStatusFilterView( parent ); + YUI_CHECK_NEW( _statusFilterView ); + _filters->addPage( _( "&Installation Summary" ), _statusFilterView, "inst_summary", + true ); // showAlways } QWidget * YQPackageSelector::layoutRightPane( QWidget *parent ) { - QWidget * right_pane_vbox = new QWidget( parent ); - - QVBoxLayout *layout = new QVBoxLayout( right_pane_vbox ); - - Q_CHECK_PTR( right_pane_vbox ); - - QSplitter * splitter = new QSplitter( Qt::Vertical, right_pane_vbox ); - Q_CHECK_PTR( splitter ); + QVBoxLayout *layout = new QVBoxLayout( parent ); + YUI_CHECK_NEW( layout ); + layout->setContentsMargins( SPLITTER_HALF_SPACING, // left + 0, // top + 0, // right + 0 ); // bottom + + QSplitter * splitter = new QSplitter( Qt::Vertical, parent ); + YUI_CHECK_NEW( splitter ); layout->addWidget(splitter); - Q_CHECK_PTR( splitter ); layoutPkgList( splitter ); - layoutDetailsViews( splitter ); + layoutButtons( parent ); - layoutButtons( right_pane_vbox ); - - return right_pane_vbox; + return parent; } @@ -420,7 +403,7 @@ YQPackageSelector::layoutPkgList( QWidget *parent ) { _pkgList= new YQPkgList( parent ); - Q_CHECK_PTR( _pkgList ); + YUI_CHECK_NEW( _pkgList ); connect( _pkgList, SIGNAL( statusChanged() ), this, SLOT ( autoResolveDependencies() ) ); @@ -434,19 +417,19 @@ _detailsViews = new QTabWidget( parent ); - Q_CHECK_PTR( _detailsViews ); + YUI_CHECK_NEW( _detailsViews ); // // Description // _pkgDescriptionView = new YQPkgDescriptionView( _detailsViews ); - Q_CHECK_PTR( _pkgDescriptionView ); + YUI_CHECK_NEW( _pkgDescriptionView ); _detailsViews->addTab( _pkgDescriptionView, _( "D&escription" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgDescriptionView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); // @@ -454,11 +437,11 @@ // _pkgTechnicalDetailsView = new YQPkgTechnicalDetailsView( _detailsViews ); - Q_CHECK_PTR( _pkgTechnicalDetailsView ); + YUI_CHECK_NEW( _pkgTechnicalDetailsView ); _detailsViews->addTab( _pkgTechnicalDetailsView, _( "&Technical Data" ) ); - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgTechnicalDetailsView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); @@ -467,12 +450,12 @@ // _pkgDependenciesView = new YQPkgDependenciesView( _detailsViews ); - Q_CHECK_PTR( _pkgDependenciesView ); + YUI_CHECK_NEW( _pkgDependenciesView ); _detailsViews->addTab( _pkgDependenciesView, _( "Dependencies" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgDependenciesView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); @@ -483,11 +466,11 @@ _pkgVersionsView = new YQPkgVersionsView( _detailsViews, true ); // userCanSwitchVersions - Q_CHECK_PTR( _pkgVersionsView ); + YUI_CHECK_NEW( _pkgVersionsView ); _detailsViews->addTab( _pkgVersionsView, _( "&Versions" ) ); - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgVersionsView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); @@ -498,12 +481,12 @@ if ( haveInstalledPkgs ) // file list information is only available for installed pkgs { _pkgFileListView = new YQPkgFileListView( _detailsViews ); - Q_CHECK_PTR( _pkgFileListView ); + YUI_CHECK_NEW( _pkgFileListView ); _detailsViews->addTab( _pkgFileListView, _( "File List" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert - connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), + connect( _pkgList, SIGNAL( currentItemChanged ( ZyppSel ) ), _pkgFileListView, SLOT ( showDetailsIfVisible( ZyppSel ) ) ); } @@ -515,7 +498,7 @@ if ( haveInstalledPkgs ) // change log information is only available for installed pkgs { _pkgChangeLogView = new YQPkgChangeLogView( _detailsViews ); - Q_CHECK_PTR( _pkgChangeLogView ); + YUI_CHECK_NEW( _pkgChangeLogView ); _detailsViews->addTab( _pkgChangeLogView, _( "Change Log" ) ); _detailsViews->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); // hor/vert @@ -530,16 +513,22 @@ YQPackageSelector::layoutButtons( QWidget *parent ) { QWidget * button_box = new QWidget( parent ); - Q_CHECK_PTR( button_box ); + YUI_CHECK_NEW( button_box ); parent->layout()->addWidget( button_box ); - QHBoxLayout *layout = new QHBoxLayout(button_box); - button_box->setLayout(layout); + QHBoxLayout * layout = new QHBoxLayout( button_box ); + YUI_CHECK_NEW( layout ); + + button_box->setLayout( layout ); + layout->setContentsMargins( 2, // left + 2, // top + 2, // right + 2 ); // bottom layout->addStretch(); QPushButton * cancel_button = new QPushButton( _( "&Cancel" ), button_box ); - Q_CHECK_PTR( cancel_button ); + YUI_CHECK_NEW( cancel_button ); layout->addWidget(cancel_button); cancel_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert @@ -549,7 +538,7 @@ QPushButton * accept_button = new QPushButton( _( "&Accept" ), button_box ); - Q_CHECK_PTR( accept_button ); + YUI_CHECK_NEW( accept_button ); layout->addWidget(accept_button); accept_button->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ) ); // hor/vert @@ -564,12 +553,11 @@ YQPackageSelector::layoutMenuBar( QWidget *parent ) { _menuBar = new QMenuBar( parent ); - Q_CHECK_PTR( _menuBar ); - + YUI_CHECK_NEW( _menuBar ); parent->layout()->addWidget(_menuBar); _fileMenu = 0; - _viewMenu = 0; + _optionsMenu = 0; _pkgMenu = 0; _patchMenu = 0; _extrasMenu = 0; @@ -588,8 +576,8 @@ // _fileMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _fileMenu ); - QAction *action = _menuBar->addMenu( _fileMenu ); + YUI_CHECK_NEW( _fileMenu ); + QAction * action = _menuBar->addMenu( _fileMenu ); action->setText( _( "&File" )); _fileMenu->addAction( _( "&Import..." ), this, SLOT( pkgImport() ) ); @@ -604,40 +592,11 @@ if ( _pkgList ) { // - // View menu - // - - _viewMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _viewMenu ); - QAction *action = _menuBar->addMenu( _viewMenu ); - action->setText(_( "&View" )); - - // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! - _showDevelAction = _viewMenu->addAction( _( "Show -de&vel Packages" ), - this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); - _showDevelAction->setCheckable(true); - _showDevelAction->setChecked(true); - - _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); - Q_CHECK_PTR( _excludeDevelPkgs ); - _excludeDevelPkgs->enable( false ); - - // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! - _showDebugAction = _viewMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), - this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); - _showDebugAction->setCheckable(true); - _showDebugAction->setChecked(true); - _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); - Q_CHECK_PTR( _excludeDebugInfoPkgs ); - _excludeDebugInfoPkgs->enable( false ); - - - // // Package menu // _pkgMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _pkgMenu ); + YUI_CHECK_NEW( _pkgMenu ); action = _menuBar->addMenu( _pkgMenu ); action->setText(_( "&Package" )); @@ -647,7 +606,7 @@ _pkgMenu->addAction(_pkgList->actionSetCurrentDelete); _pkgMenu->addAction(_pkgList->actionSetCurrentUpdate); _pkgMenu->addAction(_pkgList->actionSetCurrentTaboo); - _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); + _pkgMenu->addAction(_pkgList->actionShowCurrentSolverInfo); #if ENABLE_SOURCE_RPMS _pkgMenu->addSeparator(); @@ -658,7 +617,7 @@ _pkgMenu->addSeparator(); QMenu * submenu = _pkgList->addAllInListSubMenu( _pkgMenu ); - Q_CHECK_PTR( submenu ); + YUI_CHECK_NEW( submenu ); #if ENABLE_SOURCE_RPMS submenu->addSeparator(); @@ -672,7 +631,7 @@ // submenu = new QMenu( _pkgMenu ); - Q_CHECK_PTR( submenu ); + YUI_CHECK_NEW( submenu ); // Translators: Unlike the "all in this list" submenu, this submenu // refers to all packages globally, not only to those that are @@ -695,7 +654,7 @@ // _patchMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _patchMenu ); + YUI_CHECK_NEW( _patchMenu ); action = _menuBar->addMenu( _patchMenu ); action->setText(_( "&Patch" )); @@ -721,7 +680,7 @@ if ( repoMgrEnabled() ) { _configMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _configMenu ); + YUI_CHECK_NEW( _configMenu ); action = _menuBar->addMenu( _configMenu ); action->setText(_( "&Configuration" )); _configMenu->addAction( _( "&Repositories..." ), this, SLOT( repoManager() ), Qt::CTRL + Qt::Key_R ); @@ -731,9 +690,9 @@ // // Dependency menu // - + _dependencyMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _dependencyMenu ); + YUI_CHECK_NEW( _dependencyMenu ); action = _menuBar->addMenu( _dependencyMenu ); action->setText(_( "&Dependencies" )); @@ -745,19 +704,48 @@ // + // View menu + // + + _optionsMenu = new QMenu( _menuBar ); + YUI_CHECK_NEW( _optionsMenu ); + action = _menuBar->addMenu( _optionsMenu ); + // Translators: Menu for view options (Use a noun, not a verb!) + action->setText(_( "&Options" )); + + // Translators: This is about packages ending in "-devel", so don't translate that "-devel"! + _showDevelAction = _optionsMenu->addAction( _( "Show -de&vel Packages" ), + this, SLOT( pkgExcludeDevelChanged( bool ) ), Qt::Key_F7 ); + _showDevelAction->setCheckable(true); + _showDevelAction->setChecked(true); + + _excludeDevelPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-devel(-\\d+bit)?$" ), _pkgList->nameCol() ); + YUI_CHECK_NEW( _excludeDevelPkgs ); + _excludeDevelPkgs->enable( false ); + + // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! + _showDebugAction = _optionsMenu->addAction( _( "Show -&debuginfo/-debugsource Packages" ), + this, SLOT( pkgExcludeDebugChanged( bool ) ), Qt::Key_F8 ); + _showDebugAction->setCheckable(true); + _showDebugAction->setChecked(true); + _excludeDebugInfoPkgs = new YQPkgObjList::ExcludeRule( _pkgList, QRegExp( ".*-(debuginfo|debugsource)$" ), _pkgList->nameCol() ); + YUI_CHECK_NEW( _excludeDebugInfoPkgs ); + _excludeDebugInfoPkgs->enable( false ); + + + // // Extras menu // + _extrasMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _extrasMenu ); + YUI_CHECK_NEW( _extrasMenu ); action = _menuBar->addMenu( _extrasMenu ); action->setText(_( "&Extras" )); - _extrasMenu->addAction( _( "Show &Products" ), this, SLOT( showProducts() ) ); - _extrasMenu->addAction( _( "Show P&ackage Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); - _extrasMenu->addAction( _( "&Verify System" ), this, SLOT( verifySystem() ) ); + _extrasMenu->addAction( _( "Show &Products" ), this, SLOT( showProducts() ) ); + _extrasMenu->addAction( _( "Show P&ackage Changes" ), this, SLOT( showAutoPkgList() ), Qt::CTRL + Qt::Key_A ); + _extrasMenu->addAction( _( "&Verify System" ), this, SLOT( verifySystem() ) ); - - _extrasMenu->addSeparator(); #if BRAINDEAD_LIB_NAMING_SCHEME @@ -769,10 +757,9 @@ // Translators: This is about packages ending in "-debuginfo", so don't translate that "-debuginfo"! _extrasMenu->addAction( _( "Install All Matching -de&buginfo Packages" ), this, SLOT( installDebugInfoPkgs() ) ); - + // Translators: This is about packages ending in "-debugsource", so don't translate that "-debugsource"! _extrasMenu->addAction( _( "Install All Matching -debug&source Packages" ), this, SLOT( installDebugSourcePkgs() ) ); - _extrasMenu->addSeparator(); @@ -783,7 +770,6 @@ if ( _actionResetIgnoredDependencyProblems ) _extrasMenu->addAction(_actionResetIgnoredDependencyProblems); - #ifdef FIXME if ( _patchList ) _extrasMenu->addAction(_patchList->actionShowRawPatchInfo); @@ -795,7 +781,7 @@ // _helpMenu = new QMenu( _menuBar ); - Q_CHECK_PTR( _helpMenu ); + YUI_CHECK_NEW( _helpMenu ); _menuBar->addSeparator(); action = _menuBar->addMenu( _helpMenu ); action->setText(_( "&Help" )); @@ -810,7 +796,7 @@ _helpMenu->addAction( _( "&Symbols" ), this, SLOT( symbolHelp() ), Qt::SHIFT + Qt::Key_F1 ); // Menu entry for keyboard help - _helpMenu->addAction( _( "&Keys" ), this, SLOT( keyboardHelp() ) ); + _helpMenu->addAction( _( "&Keys" ), this, SLOT( keyboardHelp() ) ); } @@ -847,16 +833,15 @@ pkgList, SLOT ( setFocus() ) ); - - if ( hasUpdateSignal ) + if ( hasUpdateSignal && _filters->diskUsageList() ) { connect( filter, SIGNAL( updatePackages() ), pkgList, SLOT ( updateItemStates() ) ); - if ( _diskUsageList ) + if ( _filters->diskUsageList() ) { - connect( filter, SIGNAL( updatePackages() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); + connect( filter, SIGNAL( updatePackages() ), + _filters->diskUsageList(), SLOT ( updateDiskUsage() ) ); } } } @@ -867,12 +852,15 @@ { connectFilter( _updateProblemFilterView, _pkgList, false ); connectFilter( _patternList, _pkgList ); - connectFilter( _langList, _pkgList ); + connectFilter( _langList, _pkgList ); connectFilter( _repoFilterView, _pkgList, false ); + connectFilter( _packageKitGroupsFilterView, _pkgList, false ); connectFilter( _rpmGroupTagsFilterView, _pkgList, false ); - //FIXMEconnectFilter( _langList, _pkgList ); connectFilter( _statusFilterView, _pkgList, false ); connectFilter( _searchFilterView, _pkgList, false ); + + // FIXME + // connectFilter( _langList, _pkgList ); if ( _searchFilterView && _pkgList ) { @@ -886,11 +874,11 @@ _pkgList, SLOT ( addPkgItemDimmed ( ZyppSel, ZyppPkg ) ) ); } - if ( _pkgList && _diskUsageList ) + if ( _pkgList && _filters->diskUsageList() ) { - connect( _pkgList, SIGNAL( statusChanged() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); + connect( _pkgList, SIGNAL( statusChanged() ), + _filters->diskUsageList(), SLOT ( updateDiskUsage() ) ); } connectPatchList(); @@ -916,10 +904,10 @@ } - if ( _diskUsageList ) + if ( _filters->diskUsageList() ) { connect( _pkgConflictDialog, SIGNAL( updatePackages() ), - _diskUsageList, SLOT ( updateDiskUsage() ) ); + _filters->diskUsageList(), SLOT ( updateDiskUsage() ) ); } } @@ -940,7 +928,7 @@ // QShortcut * accel = new QShortcut( Qt::Key_F2, this, SLOT( hotkeyInsertPatchFilterView() ) ); - Q_CHECK_PTR( accel ); + YUI_CHECK_NEW( accel ); // // Update actions just before opening menus @@ -1003,11 +991,11 @@ if ( ! _patchFilterView ) { _patchFilterView = new YQPkgPatchFilterView( this ); - Q_CHECK_PTR( _patchFilterView ); - _filters->addPage( _( "Patches" ), _patchFilterView ); + YUI_CHECK_NEW( _patchFilterView ); + _filters->addPage( _( "P&atches" ), _patchFilterView, "patches" ); _patchList = _patchFilterView->patchList(); - Q_CHECK_PTR( _patchList ); + YUI_CHECK_PTR( _patchList ); connectPatchList(); } @@ -1028,6 +1016,10 @@ _pkgList->clear(); _patchList->filter(); } + else + { + _filters->showPage( _patchFilterView ); + } } @@ -1104,8 +1096,8 @@ _( "Error" ), // caption _( "Error exporting package list to %1" ).arg( filename ), QMessageBox::Ok | QMessageBox::Default, // button0 - Qt::NoButton, // button1 - Qt::NoButton ); // button2 + Qt::NoButton, // button1 + Qt::NoButton ); // button2 } } } @@ -1114,7 +1106,7 @@ void YQPackageSelector::pkgImport() { - QString filename = QFileDialog::getOpenFileName( this, _( "Load Package List" ), DEFAULT_EXPORT_FILE_NAME, // startsWi + QString filename = QFileDialog::getOpenFileName( this, _( "Load Package List" ), DEFAULT_EXPORT_FILE_NAME, "*.xml+;;*"// filter ); @@ -1327,6 +1319,7 @@ YQPkgProductDialog::showProductDialog(); } + void YQPackageSelector::installDevelPkgs() { @@ -1351,7 +1344,7 @@ void YQPackageSelector::pkgExcludeDebugChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDebugInfoPkgs ) _excludeDebugInfoPkgs->enable( ! on ); @@ -1360,10 +1353,11 @@ } } + void YQPackageSelector::pkgExcludeDevelChanged( bool on ) { - if ( _viewMenu && _pkgList ) + if ( _optionsMenu && _pkgList ) { if ( _excludeDevelPkgs ) _excludeDevelPkgs->enable( ! on ); @@ -1372,6 +1366,7 @@ } } + void YQPackageSelector::installSubPkgs( const QString & suffix ) { @@ -1466,9 +1461,9 @@ _( "Added Subpackages:" ), QRegExp( ".*" + suffix + "$" ), _( "&OK" ), - QString::null, // rejectButtonLabel + QString::null, // rejectButtonLabel YQPkgChangesDialog::FilterAutomatic, - YQPkgChangesDialog::OptionNone ); // showIfEmpty + YQPkgChangesDialog::OptionNone ); // showIfEmpty } Modified: trunk/qt-pkg/src/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.h?r… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.h (original) +++ trunk/qt-pkg/src/YQPackageSelector.h Thu Jan 29 12:05:23 2009 @@ -43,12 +43,15 @@ class YQPkgChangeLogView; class YQPkgDependenciesView; class YQPkgDescriptionView; -class YQPkgDiskUsageList; class YQPkgFileListView; -class YQPkgRepoFilterView; +class YQPkgFilterTab; class YQPkgLangList; class YQPkgList; +class YQPkgPackageKitGroupsFilterView; +class YQPkgPatchFilterView; +class YQPkgPatchList; class YQPkgPatternList; +class YQPkgRepoFilterView; class YQPkgRpmGroupTagsFilterView; class YQPkgSearchFilterView; class YQPkgSelList; @@ -56,8 +59,6 @@ class YQPkgTechnicalDetailsView; class YQPkgUpdateProblemFilterView; class YQPkgVersionsView; -class YQPkgPatchFilterView; -class YQPkgPatchList; class YQPackageSelector : public YQPackageSelectorBase { @@ -201,7 +202,6 @@ void basicLayout(); - QWidget * layoutLeftPane ( QWidget *parent ); QWidget * layoutRightPane ( QWidget *parent ); void layoutFilters ( QWidget *parent ); void layoutPkgList ( QWidget *parent ); @@ -294,7 +294,7 @@ QAction * _autoDependenciesAction; QPushButton * _checkDependenciesButton; QTabWidget * _detailsViews; - QY2ComboTabWidget * _filters; + YQPkgFilterTab * _filters; YQPkgChangeLogView * _pkgChangeLogView; YQPkgDependenciesView * _pkgDependenciesView; YQPkgDescriptionView * _pkgDescriptionView; @@ -303,6 +303,7 @@ YQPkgLangList * _langList; YQPkgList * _pkgList; YQPkgPatternList * _patternList; + YQPkgPackageKitGroupsFilterView * _packageKitGroupsFilterView; YQPkgRpmGroupTagsFilterView * _rpmGroupTagsFilterView; YQPkgSearchFilterView * _searchFilterView; YQPkgStatusFilterView * _statusFilterView; @@ -313,14 +314,14 @@ YQPkgPatchList * _patchList; QMenuBar * _menuBar; - QMenu * _fileMenu; - QMenu * _viewMenu; - QMenu * _pkgMenu; - QMenu * _patchMenu; - QMenu * _configMenu; - QMenu * _dependencyMenu; - QMenu * _extrasMenu; - QMenu * _helpMenu; + QMenu * _fileMenu; + QMenu * _pkgMenu; + QMenu * _patchMenu; + QMenu * _configMenu; + QMenu * _dependencyMenu; + QMenu * _optionsMenu; + QMenu * _extrasMenu; + QMenu * _helpMenu; QAction *_showDevelAction; QAction *_showDebugAction; Modified: trunk/qt-pkg/src/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatchList.cc?rev… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatchList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatchList.cc Thu Jan 29 12:05:23 2009 @@ -289,11 +289,11 @@ if ( patch ) { - zypp::Patch::Contents c(patch->contents()); - MIL << c << endl; + zypp::Patch::Contents contents(patch->contents()); + yuiMilestone() << contents << endl; - for ( zypp::Patch::Contents::Selectable_iterator it = c.selectableBegin(); - it != c.selectableEnd(); + for ( zypp::Patch::Contents::Selectable_iterator it = contents.selectableBegin(); + it != contents.selectableEnd(); ++it ) { ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); @@ -305,13 +305,12 @@ } else { - MIL << "patch is bogus" << endl; - + yuiMilestone() << "patch is bogus" << endl; } } else - WAR << "selection empty" << endl; + yuiWarning() << "selection empty" << endl; emit filterFinished(); } Modified: trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRpmGroupTagsFilt… ============================================================================== --- trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc (original) +++ trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.cc Thu Jan 29 12:05:23 2009 @@ -22,200 +22,89 @@ #define YUILogComponent "qt-pkg" #include "YUILog.h" -#include <QApplication> - -#include "YQPackageSelector.h" -#include "zypp/sat/LookupAttr.h" - #include "YQPkgRpmGroupTagsFilterView.h" #include "YQi18n.h" #include "utf8.h" -QString -translatedText( YPkgGroupEnum group ) -{ - switch ( group ) - { - case PK_GROUP_ENUM_ACCESSIBILITY: return _( "Accessibility" ); - case PK_GROUP_ENUM_ACCESSORIES: return _( "Accessories" ); - case PK_GROUP_ENUM_EDUCATION: return _( "Education" ); - case PK_GROUP_ENUM_GAMES: return _( "Games" ); - case PK_GROUP_ENUM_GRAPHICS: return _( "Graphics" ); - case PK_GROUP_ENUM_INTERNET: return _( "Internet" ); - case PK_GROUP_ENUM_OFFICE: return _( "Office" ); - case PK_GROUP_ENUM_OTHER: return _( "Other" ); - case PK_GROUP_ENUM_PROGRAMMING: return _( "Programming" ); - case PK_GROUP_ENUM_MULTIMEDIA: return _( "Multimedia" ); - case PK_GROUP_ENUM_SYSTEM: return _( "System" ); - case PK_GROUP_ENUM_DESKTOP_GNOME: return _( "GNOME Desktop" ); - case PK_GROUP_ENUM_DESKTOP_KDE: return _( "KDE Desktop" ); - case PK_GROUP_ENUM_DESKTOP_XFCE: return _( "XFCE Desktop" ); - case PK_GROUP_ENUM_DESKTOP_OTHER: return _( "Other Desktops" ); - case PK_GROUP_ENUM_PUBLISHING: return _( "Publishing" ); - case PK_GROUP_ENUM_SERVERS: return _( "Servers" ); - case PK_GROUP_ENUM_FONTS: return _( "Fonts" ); - case PK_GROUP_ENUM_ADMIN_TOOLS: return _( "Admin Tools" ); - case PK_GROUP_ENUM_LEGACY: return _( "Legacy" ); - case PK_GROUP_ENUM_LOCALIZATION: return _( "Localization" ); - case PK_GROUP_ENUM_VIRTUALIZATION: return _( "Virtualization" ); - case PK_GROUP_ENUM_SECURITY: return _( "Security" ); - case PK_GROUP_ENUM_POWER_MANAGEMENT: return _( "Power Management" ); - case PK_GROUP_ENUM_COMMUNICATION: return _( "Communication" ); - case PK_GROUP_ENUM_NETWORK: return _( "Network" ); - case PK_GROUP_ENUM_MAPS: return _( "Maps" ); - case PK_GROUP_ENUM_REPOS: return _( "Software Sources" ); - case PK_GROUP_ENUM_UNKNOWN: return _( "Unknown Group" ); - - case YPKG_GROUP_ALL: return _( "All Packages" ); - case YPKG_GROUP_SUGGESTED: return _( "Suggested Packages" ); - case YPKG_GROUP_RECOMMENDED: return _( "Recommended Packages"); - // Intentionally omitting 'default' case so gcc can catch unhandled enums - } - - return _("Unknown Group"); -} +YRpmGroupsTree * YQPkgRpmGroupTagsFilterView::_rpmGroupsTree = 0; -string -groupIcon( YPkgGroupEnum group ) +YQPkgRpmGroupTagsFilterView::YQPkgRpmGroupTagsFilterView( QWidget * parent ) + : QTreeWidget( parent ) { - switch ( group ) - { - case PK_GROUP_ENUM_ACCESSIBILITY: return( "package_main" ); - case PK_GROUP_ENUM_ACCESSORIES: return( "package_applications" ); - case PK_GROUP_ENUM_EDUCATION: return( "package_edutainment" ); - case PK_GROUP_ENUM_GAMES: return( "package_games" ); - case PK_GROUP_ENUM_GRAPHICS: return( "package_graphics" ); - case PK_GROUP_ENUM_INTERNET: return( "package_network" ); - case PK_GROUP_ENUM_OFFICE: return( "package_office_addressbook" ); - case PK_GROUP_ENUM_OTHER: return( "package_main" ); - case PK_GROUP_ENUM_PROGRAMMING: return( "package_development" ); - case PK_GROUP_ENUM_MULTIMEDIA: return( "package_multimedia" ); - case PK_GROUP_ENUM_SYSTEM: return( "yast-system" ); - case PK_GROUP_ENUM_DESKTOP_GNOME: return( "pattern-gnome" ); - case PK_GROUP_ENUM_DESKTOP_KDE: return( "pattern-kde" ); - case PK_GROUP_ENUM_DESKTOP_XFCE: return( "package_utility_desktop" ); - case PK_GROUP_ENUM_DESKTOP_OTHER: return( "package_utility_desktop" ); - case PK_GROUP_ENUM_PUBLISHING: return( "package_main" ); - case PK_GROUP_ENUM_SERVERS: return( "package_editors" ); - case PK_GROUP_ENUM_FONTS: return( "package_main" ); - case PK_GROUP_ENUM_ADMIN_TOOLS: return( "yast-sysconfig" ); - case PK_GROUP_ENUM_LEGACY: return( "package_main" ); - case PK_GROUP_ENUM_LOCALIZATION: return( "yast-language" ); - case PK_GROUP_ENUM_VIRTUALIZATION: return( "yast-create-new-vm" ); - case PK_GROUP_ENUM_SECURITY: return( "yast-security" ); - case PK_GROUP_ENUM_POWER_MANAGEMENT: return( "package_settings_power" ); - case PK_GROUP_ENUM_COMMUNICATION: return( "yast-modem" ); - case PK_GROUP_ENUM_NETWORK: return( "package_network" ); - case PK_GROUP_ENUM_MAPS: return( "package_main" ); - case PK_GROUP_ENUM_REPOS: return( "package_main" ); - case PK_GROUP_ENUM_UNKNOWN: return( "package_main" ); - - case YPKG_GROUP_SUGGESTED: return( "package_edutainment_languages" ); - case YPKG_GROUP_RECOMMENDED: return( "package_edutainment_languages" ); - case YPKG_GROUP_ALL: return( "package_main" ); + setHeaderLabels( QStringList(_( "Package Groups" )) ); + setRootIsDecorated( true ); + cloneTree( rpmGroupsTree()->root(), 0 ); - // Intentionally omitting 'default' case so gcc can catch unhandled enums - } + new YQPkgRpmGroupTag( this, _( "zzz All" ), 0 ); + + connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), + this, SLOT ( slotSelectionChanged ( QTreeWidgetItem * ) ) ); - return( "" ); + selectSomething(); } -YPkgGroupEnum -rpmGroupToPackageKitGroup( const string & rpmGroup ) +YQPkgRpmGroupTagsFilterView::~YQPkgRpmGroupTagsFilterView() { - string group = zypp::str::toLower( rpmGroup ); +} - if ( group.find( "amusements/teaching" ) != string::npos ) return PK_GROUP_ENUM_EDUCATION; - if ( group.find( "amusements" ) != string::npos ) return PK_GROUP_ENUM_GAMES; - if ( group.find( "development" ) != string::npos ) return PK_GROUP_ENUM_PROGRAMMING; - if ( group.find( "hardware" ) != string::npos ) return PK_GROUP_ENUM_SYSTEM; - if ( group.find( "archiving" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "clustering" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "system/monitoring" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "databases" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "system/management" ) != string::npos ) return PK_GROUP_ENUM_ADMIN_TOOLS; - if ( group.find( "graphics" ) != string::npos ) return PK_GROUP_ENUM_GRAPHICS; - if ( group.find( "multimedia" ) != string::npos ) return PK_GROUP_ENUM_MULTIMEDIA; - if ( group.find( "network" ) != string::npos ) return PK_GROUP_ENUM_NETWORK; - if ( group.find( "office" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; - if ( group.find( "text" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; - if ( group.find( "editors" ) != string::npos ) return PK_GROUP_ENUM_OFFICE; - if ( group.find( "publishing" ) != string::npos ) return PK_GROUP_ENUM_PUBLISHING; - if ( group.find( "security" ) != string::npos ) return PK_GROUP_ENUM_SECURITY; - if ( group.find( "telephony" ) != string::npos ) return PK_GROUP_ENUM_COMMUNICATION; - if ( group.find( "gnome" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_GNOME; - if ( group.find( "kde" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_KDE; - if ( group.find( "xfce" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_XFCE; - if ( group.find( "gui/other" ) != string::npos ) return PK_GROUP_ENUM_DESKTOP_OTHER; - if ( group.find( "localization" ) != string::npos ) return PK_GROUP_ENUM_LOCALIZATION; - if ( group.find( "system" ) != string::npos ) return PK_GROUP_ENUM_SYSTEM; - if ( group.find( "scientific" ) != string::npos ) return PK_GROUP_ENUM_EDUCATION; - return PK_GROUP_ENUM_UNKNOWN; -} +YRpmGroupsTree * +YQPkgRpmGroupTagsFilterView::rpmGroupsTree() +{ + if ( ! _rpmGroupsTree ) + { + _rpmGroupsTree = new YRpmGroupsTree(); + Q_CHECK_PTR( _rpmGroupsTree ); + fillRpmGroupsTree(); + } + return _rpmGroupsTree; +} -YQPkgRpmGroupTagsFilterView::YQPkgRpmGroupTagsFilterView( QWidget * parent ) - : QTreeWidget( parent ) - , _selectedGroup(YPKG_GROUP_ALL) +void +YQPkgRpmGroupTagsFilterView::fillRpmGroupsTree() { - setIconSize(QSize(32,32)); - setHeaderLabels( QStringList(_( "Package Groups" )) ); - setRootIsDecorated( false ); - setSortingEnabled( true ); - connect( this, SIGNAL( currentItemChanged ( QTreeWidgetItem *, QTreeWidgetItem * ) ), - this, SLOT ( slotSelectionChanged ( QTreeWidgetItem * ) ) ); - fillGroups(); + yuiDebug() << "Filling RPM groups tree" << endl; - selectSomething(); -} + for ( ZyppPoolIterator it = zyppPkgBegin(); + it != zyppPkgEnd(); + ++it ) + { + ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); + if ( zyppPkg ) + rpmGroupsTree()->addRpmGroup( zyppPkg->group() ); + } -YQPkgRpmGroupTagsFilterView::~YQPkgRpmGroupTagsFilterView() -{ + yuiDebug() << "Filling RPM groups tree done" << endl; } void -YQPkgRpmGroupTagsFilterView::fillGroups() +YQPkgRpmGroupTagsFilterView::cloneTree( YStringTreeItem * parentRpmGroup, + YQPkgRpmGroupTag * parentClone ) { - if ( _groupsMap.empty() ) - { - zypp::sat::LookupAttr rpmgroups( zypp::sat::SolvAttr::group ); - for ( zypp::sat::LookupAttr::iterator it = rpmgroups.begin(); - it != rpmgroups.end(); - ++it ) - { - YPkgGroupEnum group; - std::map<std::string, YPkgGroupEnum>::const_iterator itg = _groupsCache.find(it.asString()); - if ( itg == _groupsCache.end() ) - { - group = rpmGroupToPackageKitGroup( it.asString() ); - _groupsCache[it.asString()] = group; - } - else - { - group = itg->second; - } - - //std::cout << it.asString() << std::endl; - - if ( _groupsMap.find(group) == _groupsMap.end() ) - { - _groupsMap[group] = new YQPkgRpmGroupTag( this, group ); - } - } - - _groupsMap[ YPKG_GROUP_ALL ] = new YQPkgRpmGroupTag( this, YPKG_GROUP_ALL ); - _groupsMap[ YPKG_GROUP_RECOMMENDED ] = new YQPkgRpmGroupTag( this, YPKG_GROUP_RECOMMENDED ); - _groupsMap[ YPKG_GROUP_SUGGESTED ] = new YQPkgRpmGroupTag( this, YPKG_GROUP_SUGGESTED ); + YStringTreeItem * child = parentRpmGroup->firstChild(); + YQPkgRpmGroupTag * clone; + while ( child ) + { + if ( parentClone ) + clone = new YQPkgRpmGroupTag( this, parentClone, child ); + else + clone = new YQPkgRpmGroupTag( this, child ); + + Q_CHECK_PTR( clone ); + //FIXME clone->setExpanded( clone->depth() < 1 ); + clone->setExpanded( true ); + cloneTree( child, clone ); + child = child->next(); } } @@ -225,9 +114,9 @@ { // FIXME // QTreeWidgetItem * item = children().first(); -// +// // if ( item ) -// setCurrentItem(item); +// setCurrentItem(item); } @@ -244,7 +133,7 @@ { emit filterStart(); // yuiDebug() << "Filtering packages for RPM group \"" << selectedRpmGroup() << "\"" << endl; - + if ( selection() ) { for ( ZyppPoolIterator it = zyppPkgBegin(); @@ -269,7 +158,7 @@ // any other instance. if ( ! match && - ! selectable->candidateObj() && + ! selectable->candidateObj() && ! selectable->installedObj() ) check( selectable, tryCastToZyppPkg( selectable->theObj() ) ); } @@ -286,22 +175,14 @@ if ( sel ) { - _selectedGroup = sel->group(); - // for the list of reccommended packages, we need - // to solve first - if ( _selectedGroup == YPKG_GROUP_SUGGESTED || - _selectedGroup == YPKG_GROUP_RECOMMENDED ) - { - // set the busy cursor for the solving - QApplication::setOverrideCursor(Qt::WaitCursor); - zypp::getZYpp()->resolver()->resolvePool(); - QApplication::restoreOverrideCursor(); - } - + if ( sel->rpmGroup() ) + _selectedRpmGroup = rpmGroupsTree()->rpmGroup( sel->rpmGroup() ); + else + _selectedRpmGroup = "*"; // "zzz_All" } else { - _selectedGroup = YPKG_GROUP_ALL; + _selectedRpmGroup = ""; } filter(); @@ -309,42 +190,28 @@ bool -YQPkgRpmGroupTagsFilterView::check( ZyppSel selectable, - ZyppPkg pkg ) +YQPkgRpmGroupTagsFilterView::check( ZyppSel selectable, + ZyppPkg pkg ) { if ( ! pkg || ! selection() ) return false; - if ( selection()->group() == YPKG_GROUP_ALL ) // Special case: All packages + if ( selection()->rpmGroup() == 0 ) // Special case: All packages { emit filterMatch( selectable, pkg ); return true; } - YPkgGroupEnum groupn = rpmGroupToPackageKitGroup( pkg->group() ); - - if ( groupn == selectedGroup() ) + if ( selectedRpmGroup().empty() ) + return false; + + if ( pkg->group() == selectedRpmGroup() || // full match? + pkg->group().find( selectedRpmGroup() + "/" ) == 0 ) // starts with selected? { emit filterMatch( selectable, pkg ); return true; } - if ( selectable->candidateObj() ) - { - if ( selectedGroup() == YPKG_GROUP_RECOMMENDED && - zypp::PoolItem(pkg).status().isRecommended() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - if ( selectedGroup() == YPKG_GROUP_SUGGESTED && - zypp::PoolItem(pkg).status().isSuggested() ) - { - emit filterMatch( selectable, pkg ); - return true; - } - } - return false; } @@ -363,40 +230,45 @@ -YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, - YPkgGroupEnum group ) + + +YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YStringTreeItem * rpmGroup ) : QTreeWidgetItem( parentFilterView ) , _filterView( parentFilterView ) - , _group( group ) + , _rpmGroup( rpmGroup ) { - QFont f = font(0); - QFontMetrics fm(f); - f.setPixelSize( (int) ( fm.height() * 1.1 ) ); - setFont(0,f); - - string iconName = groupIcon( group ); - setText( 0, translatedText( group ) ); - setIcon( 0, QIcon( QString( YQPackageSelector::iconPath( iconName, 32 ).c_str() ) ) ); + setText( 0, fromUTF8( _rpmGroup->value().translation() ) ); } -YQPkgRpmGroupTag::~YQPkgRpmGroupTag() +YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YQPkgRpmGroupTag * parentGroupTag, + YStringTreeItem * rpmGroup ) + : QTreeWidgetItem( parentGroupTag ) + , _filterView( parentFilterView ) + , _rpmGroup( rpmGroup ) { - // NOP + setText( 0, fromUTF8( _rpmGroup->value().translation() ) ); } -bool -YQPkgRpmGroupTag::operator< ( const QTreeWidgetItem & otherListViewItem ) const +YQPkgRpmGroupTag::YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + const QString & rpmGroupName, + YStringTreeItem * rpmGroup ) + : QTreeWidgetItem( parentFilterView ) + , _filterView( parentFilterView ) + , _rpmGroup( rpmGroup ) { - const YQPkgRpmGroupTag * otherCategoryItem = - dynamic_cast<const YQPkgRpmGroupTag *>(&otherListViewItem); + setText( 0, rpmGroupName ); +} - if ( otherCategoryItem ) - return group() > otherCategoryItem->group(); - else - return true; + +YQPkgRpmGroupTag::~YQPkgRpmGroupTag() +{ + // NOP } + #include "YQPkgRpmGroupTagsFilterView.moc" Modified: trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgRpmGroupTagsFilt… ============================================================================== --- trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h (original) +++ trunk/qt-pkg/src/YQPkgRpmGroupTagsFilterView.h Thu Jan 29 12:05:23 2009 @@ -20,57 +20,12 @@ #ifndef YQPkgRpmGroupTagsFilterView_h #define YQPkgRpmGroupTagsFilterView_h -#include <map> #include "YQZypp.h" -#include "YRpmGroupsTree.h" #include <QTreeWidget> +#include <YRpmGroupsTree.h> -using std::string; - -typedef enum -{ - // - // PackageKit values - // - - PK_GROUP_ENUM_ACCESSIBILITY, - PK_GROUP_ENUM_ACCESSORIES, - PK_GROUP_ENUM_EDUCATION, - PK_GROUP_ENUM_GAMES, - PK_GROUP_ENUM_GRAPHICS, - PK_GROUP_ENUM_INTERNET, - PK_GROUP_ENUM_OFFICE, - PK_GROUP_ENUM_OTHER, - PK_GROUP_ENUM_PROGRAMMING, - PK_GROUP_ENUM_MULTIMEDIA, - PK_GROUP_ENUM_SYSTEM, - PK_GROUP_ENUM_DESKTOP_GNOME, - PK_GROUP_ENUM_DESKTOP_KDE, - PK_GROUP_ENUM_DESKTOP_XFCE, - PK_GROUP_ENUM_DESKTOP_OTHER, - PK_GROUP_ENUM_PUBLISHING, - PK_GROUP_ENUM_SERVERS, - PK_GROUP_ENUM_FONTS, - PK_GROUP_ENUM_ADMIN_TOOLS, - PK_GROUP_ENUM_LEGACY, - PK_GROUP_ENUM_LOCALIZATION, - PK_GROUP_ENUM_VIRTUALIZATION, - PK_GROUP_ENUM_SECURITY, - PK_GROUP_ENUM_POWER_MANAGEMENT, - PK_GROUP_ENUM_COMMUNICATION, - PK_GROUP_ENUM_NETWORK, - PK_GROUP_ENUM_MAPS, - PK_GROUP_ENUM_REPOS, - PK_GROUP_ENUM_UNKNOWN, - // - // Other values - // - - YPKG_GROUP_SUGGESTED, - YPKG_GROUP_RECOMMENDED, - YPKG_GROUP_ALL, -} YPkgGroupEnum; +using std::string; class YQPkgRpmGroupTag; @@ -109,9 +64,11 @@ ZyppPkg pkg ); /** - * Returns the (untranslated!) currently selected group enum + * Returns the (untranslated!) currently selected RPM group as string. + * Special case: "*" is returned if "zzz_All" is selected. **/ - YPkgGroupEnum selectedGroup() const { return _selectedGroup; } + const string & selectedRpmGroup() const { return _selectedRpmGroup; } + public slots: @@ -136,6 +93,13 @@ **/ void selectSomething(); + /** + * Returns the internal RPM groups tree and fills it + * if it doesn't exist yet. + **/ + static YRpmGroupsTree * rpmGroupsTree(); + + signals: /** @@ -163,25 +127,58 @@ **/ void slotSelectionChanged( QTreeWidgetItem * newSelection ); + protected: - void fillGroups(); + /** + * Fill the internal RPM groups tree with RPM groups of all packages + * currently in the pool + **/ + static void fillRpmGroupsTree(); + + /** + * Recursively clone the RPM group tag tree for the QListView widget: + * Make a deep copy of the tree starting at 'parentRpmGroup' and + * 'parentClone'. + **/ + void cloneTree( YStringTreeItem * parentRpmGroup, + YQPkgRpmGroupTag * parentClone = 0 ); + // // Data members // - YPkgGroupEnum _selectedGroup; - std::map<YPkgGroupEnum, YQPkgRpmGroupTag*> _groupsMap; - // map to cache converted groups - std::map<std::string, YPkgGroupEnum> _groupsCache; + string _selectedRpmGroup; + + static YRpmGroupsTree * _rpmGroupsTree; }; + + class YQPkgRpmGroupTag: public QTreeWidgetItem { public: + /** + * Constructor for toplevel RPM group tags + **/ + YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YStringTreeItem * rpmGroup ); + + /** + * Constructor for RPM group tags that have a parent + **/ + YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, + YQPkgRpmGroupTag * parentGroupTag, + YStringTreeItem * rpmGroup ); + + /** + * Constructor for toplevel RPM group tags via STL string + * ( for special cases like "zzz All" ) + **/ YQPkgRpmGroupTag( YQPkgRpmGroupTagsFilterView * parentFilterView, - YPkgGroupEnum group ); + const QString & rpmGroupName, + YStringTreeItem * rpmGroup ); /** * Destructor @@ -194,15 +191,18 @@ **/ YQPkgRpmGroupTagsFilterView * filterView() const { return _filterView; } - YPkgGroupEnum group() const { return _group; } + /** + * Returns the original tree item + **/ + const YStringTreeItem * rpmGroup() const { return _rpmGroup; } + - virtual bool operator< ( const QTreeWidgetItem & otherListViewItem ) const; private: // Data members YQPkgRpmGroupTagsFilterView * _filterView; - YPkgGroupEnum _group; + YStringTreeItem * _rpmGroup; }; Modified: trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQZyppSolverDialogPlu… ============================================================================== --- trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc (original) +++ trunk/qt-pkg/src/YQZyppSolverDialogPluginStub.cc Thu Jan 29 12:05:23 2009 @@ -18,6 +18,7 @@ /-*/ + #include <qmessagebox.h> #include "YQZyppSolverDialogPluginStub.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] r55142 - /tags/stable-2_18_0/sshd/
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 11:03:08 2009 New Revision: 55142 URL: http://svn.opensuse.org/viewcvs/yast?rev=55142&view=rev Log: Created tag stable-2_18_0 for sshd Added: tags/stable-2_18_0/sshd/ - copied from r55141, trunk/sshd/ -- 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] r55141 - /tags/branch-Code-11-2_17_2/sshd/
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 10:54:32 2009 New Revision: 55141 URL: http://svn.opensuse.org/viewcvs/yast?rev=55141&view=rev Log: Created tag branch-Code-11-2_17_2 for sshd Added: tags/branch-Code-11-2_17_2/sshd/ - copied from r55140, branches/SuSE-Code-11-Branch/sshd/ -- 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] r55140 - in /branches/SuSE-Code-11-Branch/sshd: VERSION package/yast2-sshd.changes src/Sshd.ycp src/complex.ycp src/dialogs.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 10:53:39 2009 New Revision: 55140 URL: http://svn.opensuse.org/viewcvs/yast?rev=55140&view=rev Log: - Dropping possibility to adjust PasswordAuthentication option as it has no or rather misleading effect (bnc #469207). - 2.17.2 Modified: branches/SuSE-Code-11-Branch/sshd/VERSION branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp branches/SuSE-Code-11-Branch/sshd/src/complex.ycp branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp Modified: branches/SuSE-Code-11-Branch/sshd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/VERS… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/VERSION (original) +++ branches/SuSE-Code-11-Branch/sshd/VERSION Thu Jan 29 10:53:39 2009 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/pack… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes (original) +++ branches/SuSE-Code-11-Branch/sshd/package/yast2-sshd.changes Thu Jan 29 10:53:39 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:50:10 CET 2009 - locilka(a)suse.cz + +- Dropping possibility to adjust PasswordAuthentication option + as it has no or rather misleading effect (bnc #469207). +- 2.17.2 + +------------------------------------------------------------------- Wed Dec 10 16:43:46 CET 2008 - locilka(a)suse.cz - Forgotten text marked for translation (bnc #450474). Modified: branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp (original) +++ branches/SuSE-Code-11-Branch/sshd/src/Sshd.ycp Thu Jan 29 10:53:39 2009 @@ -60,7 +60,8 @@ "PermitRootLogin" : ["yes"], "IgnoreUserKnownHosts" : ["no"], "MaxAuthTries" : ["6"], - "PasswordAuthentication" : ["yes"], + // BNC #469207 + // "PasswordAuthentication" : ["yes"], "RSAAuthentication" : ["no"], "PubkeyAuthentication" : ["yes"], "Ciphers" : ["aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr"], Modified: branches/SuSE-Code-11-Branch/sshd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/src/complex.ycp (original) +++ branches/SuSE-Code-11-Branch/sshd/src/complex.ycp Thu Jan 29 10:53:39 2009 @@ -151,7 +151,7 @@ UI::ChangeWidget(`id("MaxAuthTries"), `Value, MaxAuthTries[0]:"0"); foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { UI::ChangeWidget(`id(key), `Value, (Sshd::GetSSHDOption(key) == ["yes"])); }); } @@ -353,7 +353,7 @@ // Stores all boolean values and turns them to the "yes"/"no" notation foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { Sshd::SetSSHDOption( key, [ (((boolean) UI::QueryWidget(`id(key), `Value) == true) ? "yes":"no") ] Modified: branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/sshd/src/… ============================================================================== --- branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-Branch/sshd/src/dialogs.ycp Thu Jan 29 10:53:39 2009 @@ -81,8 +81,11 @@ `VBox ( /* A text entry */ `Left(`InputField(`id("MaxAuthTries"), _("Ma&ximum Authentication Tries"))), - /* A check box */ - `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + +// BNC #469207 +// /* A check box */ +// `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + /* A check box */ `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation"))), /* A check box */ -- 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] r55139 - in /trunk/sshd: VERSION package/yast2-sshd.changes src/Sshd.ycp src/complex.ycp src/dialogs.ycp
by locilka＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: locilka Date: Thu Jan 29 10:53:28 2009 New Revision: 55139 URL: http://svn.opensuse.org/viewcvs/yast?rev=55139&view=rev Log: - Dropping possibility to adjust PasswordAuthentication option as it has no or rather misleading effect (bnc #469207). - 2.18.0 Modified: trunk/sshd/VERSION trunk/sshd/package/yast2-sshd.changes trunk/sshd/src/Sshd.ycp trunk/sshd/src/complex.ycp trunk/sshd/src/dialogs.ycp Modified: trunk/sshd/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/VERSION?rev=55139&r1=55138&… ============================================================================== --- trunk/sshd/VERSION (original) +++ trunk/sshd/VERSION Thu Jan 29 10:53:28 2009 @@ -1 +1 @@ -2.17.1 +2.18.0 Modified: trunk/sshd/package/yast2-sshd.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/package/yast2-sshd.changes?… ============================================================================== --- trunk/sshd/package/yast2-sshd.changes (original) +++ trunk/sshd/package/yast2-sshd.changes Thu Jan 29 10:53:28 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:50:10 CET 2009 - locilka(a)suse.cz + +- Dropping possibility to adjust PasswordAuthentication option + as it has no or rather misleading effect (bnc #469207). +- 2.18.0 + +------------------------------------------------------------------- Tue Dec 16 16:31:25 CET 2008 - locilka(a)suse.cz - Dialog buttons adapted to the current style guide. Modified: trunk/sshd/src/Sshd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/Sshd.ycp?rev=55139&r1=5… ============================================================================== --- trunk/sshd/src/Sshd.ycp (original) +++ trunk/sshd/src/Sshd.ycp Thu Jan 29 10:53:28 2009 @@ -61,7 +61,8 @@ "PermitRootLogin" : ["yes"], "IgnoreUserKnownHosts" : ["no"], "MaxAuthTries" : ["6"], - "PasswordAuthentication" : ["yes"], + // BNC #469207 + // "PasswordAuthentication" : ["yes"], "RSAAuthentication" : ["no"], "PubkeyAuthentication" : ["yes"], "Ciphers" : ["aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr"], Modified: trunk/sshd/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/complex.ycp?rev=55139&r… ============================================================================== --- trunk/sshd/src/complex.ycp (original) +++ trunk/sshd/src/complex.ycp Thu Jan 29 10:53:28 2009 @@ -151,7 +151,7 @@ UI::ChangeWidget(`id("MaxAuthTries"), `Value, MaxAuthTries[0]:"0"); foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { UI::ChangeWidget(`id(key), `Value, (Sshd::GetSSHDOption(key) == ["yes"])); }); } @@ -353,7 +353,7 @@ // Stores all boolean values and turns them to the "yes"/"no" notation foreach (string key, ["PrintMotd", "PermitRootLogin", - "PasswordAuthentication", "RSAAuthentication", "PubkeyAuthentication"], { + /* "PasswordAuthentication", BNC #469207 */ "RSAAuthentication", "PubkeyAuthentication"], { Sshd::SetSSHDOption( key, [ (((boolean) UI::QueryWidget(`id(key), `Value) == true) ? "yes":"no") ] Modified: trunk/sshd/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sshd/src/dialogs.ycp?rev=55139&r… ============================================================================== --- trunk/sshd/src/dialogs.ycp (original) +++ trunk/sshd/src/dialogs.ycp Thu Jan 29 10:53:28 2009 @@ -83,8 +83,11 @@ `MarginBox (mbox_x, mbox_y, `VBox ( /* A text entry */ `Left(`InputField(`id("MaxAuthTries"), _("Ma&ximum Authentication Tries"))), - /* A check box */ - `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + +// BNC #469207 +// /* A check box */ +// `Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))), + /* A check box */ `Left(`CheckBox (`id("RSAAuthentication"), _("RSA Authenti&cation"))), /* A check box */ -- 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] r55138 - /trunk/packager/package/yast2-packager.changes
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 10:51:52 2009 New Revision: 55138 URL: http://svn.opensuse.org/viewcvs/yast?rev=55138&view=rev Log: something for changelog Modified: trunk/packager/package/yast2-packager.changes Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jan 29 10:51:52 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:46:38 CET 2009 - kmachalkova(a)suse.cz + +- Webpin search: remember all packages selected by user in all + queries in this session + show them in "All Packages" tab +- Show "Really exit?" pop-up only if there is something to do + +------------------------------------------------------------------- Wed Jan 28 17:06:48 CET 2009 - lslezak(a)suse.cz - do not remove kernel-xenpae package at update, it can be -- 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] r55137 - /trunk/packager/src/clients/webpin_package_search.ycp
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 10:42:52 2009 New Revision: 55137 URL: http://svn.opensuse.org/viewcvs/yast?rev=55137&view=rev Log: Show "Really exit?" pop-up only if there is something to do Modified: trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Thu Jan 29 10:42:52 2009 @@ -28,8 +28,15 @@ map <string, map > search_results = $[]; map <string, map > all_selected = $[]; + boolean SomethingSelected() { + return ( all_selected != $[]); + } + boolean AbortDialog() { - return Popup::YesNo( _("All changes will be lost. Really exit?")); + if (SomethingSelected()) + return Popup::YesNo( _("All changes will be lost. Really exit?")); + else + return true; } boolean Abort() { -- 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] r55136 - /trunk/packager/src/clients/webpin_package_search.ycp
by kmachalkova＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: kmachalkova Date: Thu Jan 29 10:37:51 2009 New Revision: 55136 URL: http://svn.opensuse.org/viewcvs/yast?rev=55136&view=rev Log: - Remember packages selected by user in all queries in this session - Show them in "All Packages" tab Modified: trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Thu Jan 29 10:37:51 2009 @@ -22,10 +22,11 @@ import "WebpinPackageSearch"; import "Wizard"; import "Directory"; + import "Map"; import "Report"; - list <map> search_results = []; - map <string, integer> index = $[]; + map <string, map > search_results = $[]; + map <string, map > all_selected = $[]; boolean AbortDialog() { return Popup::YesNo( _("All changes will be lost. Really exit?")); @@ -39,7 +40,7 @@ else return false; } - + string SearchExpression() { string ret = (string) UI::QueryWidget(`id("search_text"), `Value); @@ -60,9 +61,17 @@ return ret; } + string CurrentTable() { + string ctable = UI::WidgetExists(`id("results")) ? "results" : "all"; + + return ctable; + } + void CreatePackageDescription( ) { - string checksum = (string) UI::QueryWidget(`id("results"), `CurrentItem ); - map citem = search_results [ index[checksum]: 0 ]: $[]; + string ctable = CurrentTable(); + string checksum = (string) UI::QueryWidget(`id( ctable ), `CurrentItem ); + + map citem = (ctable == "results") ? search_results[checksum]:$[] : all_selected[checksum]:$[]; string ret = ""; if ( citem != $[] ) { @@ -72,17 +81,14 @@ string archs = sformat(_("<b>Architecture:</b> %1<br>"), mergestring( citem["archs"]:[],",")); ret = "<p>" + descr + version + archs + "</p>"; } - else - ret = _("<p><b>No packages matching entered criteria were found</b></p>"); UI::ChangeWidget(`id("description"),`Value, ret); } - list CreatePackageList( list < map > results ) { + list CreatePackageListItems( map<string, map> results ) { list pkg_items = []; - integer i = 0; - foreach ( map it, results, { + foreach ( string iD, map pkg_line, results, { // Webpin seems to return "ppc" arch even for some i386 packages (e.g., "joe") // doesn't match the architecture // if (! WebpinPackageSearch::MatchesCurrentArchitecture (it["archs"]:["noarch"])) { @@ -90,25 +96,85 @@ // return; // } - pkg_items = add( pkg_items, `item(`id(it["checksum"]:""),it["name"]:"" + " - " + it["summary"]:"" )); - index = add( index, it["checksum"]:"", i); - i = i+1; + pkg_items = add( pkg_items, `item(`id(iD),pkg_line["name"]:"" + " - " + pkg_line["summary"]:"" )); }); return pkg_items; - } + } - list <map> FilterOutSelectedPackages() { - list <string> p = ( list <string> ) UI::QueryWidget(`id("results"), `SelectedItems); - list < map > result = []; + void PopulatePackageList( map <string, map> results ) { + list items = CreatePackageListItems( results ); + string ctable = CurrentTable(); + + list <string> IDs = (list <string> ) toset(Map::Keys(results)); + list <string> wantedIDs = (list <string>) toset(Map::Keys(all_selected)); + y2milestone("Package IDs: %1, previously selected: %2", IDs, wantedIDs); + + if (results != nil) { + UI::ChangeWidget(`id(ctable), `Items, items); + + if(ctable == "all") + UI::ChangeWidget(`id(ctable), `SelectedItems, wantedIDs); + else + UI::ChangeWidget(`id(ctable), `SelectedItems, multiset::intersection(IDs, wantedIDs)); - foreach ( string s, p, { - result = add(result, search_results[ index[s]:0 ]:$[]); + UI::SetFocus(`id(ctable)); + } + else + UI::SetFocus(`id("search_text")); + + } + + list <map> SelectedPackages() { + list < map > result = []; + + foreach ( string s, map m, all_selected, { + result = add(result, m); }); - y2internal("%1", result); + y2milestone("Passing these data to WebPin %1", result); return result; } + void AddItemIfNotExists( string checksum, map data ) { + if (!haskey (all_selected, checksum)) + all_selected[checksum] = data; + } + + void RemoveItemIfExists( string checksum ) { + if ( haskey (all_selected, checksum) ) + all_selected = remove(all_selected, checksum); + } + + void UpdateSelectedPkgs(){ + + string ctable = CurrentTable(); + list <string> selected_items = toset((list <string>) UI::QueryWidget(`id(ctable), `SelectedItems)); + list <string> other_items = []; + + list <term> tt = (list <term>) UI::QueryWidget(`id(ctable), `Items); + foreach(term t, tt, { + string tmp = argsof(argsof(t)[0]:`none())[0]:""; + if( !contains(selected_items, tmp) ) + other_items = add (other_items, tmp); + }); + + other_items = toset(other_items); + + if (ctable == "results") + { + foreach(string it, selected_items, { + AddItemIfNotExists( it, search_results[it]:$[] ); + }); + } + foreach(string it, other_items, { + RemoveItemIfExists( it ); + }); + + + y2milestone("Selecting these packages: %1", all_selected ); + + } + symbol ReadDialog() { list <string> steps = [ _("Check Network Configuration"), @@ -142,7 +208,13 @@ } symbol MainDialog() { - Wizard::SetContents ( + + term current_search_box = `MultiSelectionBox(`id ("results"), `opt (`notify, `hstretch), + "", [] ); + term all_pkgs_box = `MultiSelectionBox(`id ("all"), `opt (`notify, `hstretch), + "", [] ); + + Wizard::SetContents ( // TRANSLATORS: dialog caption _("Package Search"), `VBox ( @@ -180,11 +252,12 @@ //), `VWeight ( 2, - `MultiSelectionBox( - `id ("results"), `opt (`notify, `hstretch), - // TRANSLATORS: multi-selection box - _("&Found Packages"), [] - ) + `DumbTab(`id("tab_bar"), + [ `item(`id("search_tab"), _("&Found Packages"), true), + `item(`id("all_tab"), _("&All Selected Packages")) + ], + `ReplacePoint(`id(`rp), current_search_box) + ) ), //`HBox( `Left( `Label( _("Package Description")) ), @@ -215,13 +288,18 @@ UI::SetFocus(`id("search_text")); + any dialog_ret = nil; while (true) { dialog_ret = UI::UserInput(); + + if ( dialog_ret != "results" && dialog_ret != "all") + UpdateSelectedPkgs(); + if (dialog_ret == `next){ string temporary_xml = Directory::tmpdir + "/one_click_install_temporary_file.xml"; - list <map> selected_packages = FilterOutSelectedPackages(); + list <map> selected_packages = SelectedPackages(); if (selected_packages == nil || size (selected_packages) == 0) { Report::Message (_("Select some packages to install.")); @@ -236,33 +314,44 @@ break; } else if (dialog_ret == "search") { + + UI::ChangeWidget(`id("tab_bar"), `CurrentItem, "search_tab"); + UI::ReplaceWidget(`id(`rp), current_search_box ); string search_expr = SearchExpression(); if (search_expr != "") { map <string, boolean> search_params = SearchParameters(); Popup::ShowFeedback("", _("Searching for packages...")); - search_results = + list <map> tmp_results = WebpinPackageSearch::SearchForPackages( search_expr, nil, search_params ); + search_results = listmap( map m, tmp_results, { + return $[ m["checksum"]:"" : m ]; + }); Popup::ClearFeedback(); - list items = CreatePackageList( search_results ); + PopulatePackageList( search_results ); - if (search_results != nil) { - UI::ChangeWidget(`id("results"), `Items, items); - UI::SetFocus(`id("results")); - } + if ( search_results == $[] ) + UI::ChangeWidget(`id("description"), `Value, _("<p><b>No packages matching entered criteria were found</b></p>")); else - UI::SetFocus(`id("search_text")); - - CreatePackageDescription(); + CreatePackageDescription(); } - //else - continue; + continue; + } + else if (dialog_ret == "search_tab") { + UI::ReplaceWidget(`id(`rp), current_search_box ); + PopulatePackageList( search_results ); + CreatePackageDescription(); + } + else if (dialog_ret == "all_tab") { + UI::ReplaceWidget(`id(`rp), all_pkgs_box ); + PopulatePackageList( all_selected ); + CreatePackageDescription(); } - else if (dialog_ret == "results") { + else if ( dialog_ret == "results" || dialog_ret == "all") { CreatePackageDescription(); } else if (dialog_ret == `abort || dialog_ret == `cancel) { -- 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] r55135 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: aschnell Date: Thu Jan 29 10:33:17 2009 New Revision: 55135 URL: http://svn.opensuse.org/viewcvs/yast?rev=55135&view=rev Log: - fixed ordering Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Jan 29 10:33:17 2009 @@ -6,7 +6,6 @@ - 2.18.2 ------------------------------------------------------------------- - Mon Jan 26 12:22:36 CET 2009 - aschnell(a)suse.de - fixed udev partition postfix for dm based devices (bnc #468786) @@ -44,20 +43,6 @@ - redesigned resize dialog (bnc #456816 and #456816) ------------------------------------------------------------------- -Tue Dec 16 17:12:18 CET 2008 - aschnell(a)suse.de - -- escape HTML tags (bnc #450496) -- replaced getCommitActions and getCommitInfo by getCommitInfos - -------------------------------------------------------------------- -Mon Dec 15 14:19:57 CET 2008 - aschnell(a)suse.de - -- fixed typo (bnc #450455) -- removed outdated text (bnc #450792) -- removed obsolete inst_do_resize.ycp -- 2.18.0 - -------------------------------------------------------------------- Fri Dec 19 11:50:11 CET 2008 - aschnell(a)suse.de - don't check swap partitions on disks used by BIOS RAID or @@ -80,6 +65,12 @@ Points" (bnc #453746) ------------------------------------------------------------------- +Tue Dec 16 17:12:18 CET 2008 - aschnell(a)suse.de + +- escape HTML tags (bnc #450496) +- replaced getCommitActions and getCommitInfo by getCommitInfos + +------------------------------------------------------------------- Tue Dec 16 10:40:10 CET 2008 - aschnell(a)suse.de - start yast2-multipath in running system if available (bnc @@ -87,6 +78,14 @@ - fixed popup message (bnc #458972) ------------------------------------------------------------------- +Mon Dec 15 14:19:57 CET 2008 - aschnell(a)suse.de + +- fixed typo (bnc #450455) +- removed outdated text (bnc #450792) +- removed obsolete inst_do_resize.ycp +- 2.18.0 + +------------------------------------------------------------------- Thu Dec 11 16:37:11 CET 2008 - aschnell(a)suse.de - fixed reading of udev links for cciss devices (bnc #449110) @@ -5062,4 +5061,3 @@ - initial version -------------------------------------------------------------------- -- 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] r55134 - /tags/branch-Code-11-2_17_53/bootloader/
by juhliarik＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: juhliarik Date: Thu Jan 29 10:22:02 2009 New Revision: 55134 URL: http://svn.opensuse.org/viewcvs/yast?rev=55134&view=rev Log: Created tag branch-Code-11-2_17_53 for bootloader Added: tags/branch-Code-11-2_17_53/bootloader/ - copied from r55133, branches/SuSE-Code-11-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] r55133 - in /branches/SuSE-Code-11-Branch/bootloader: VERSION package/yast2-bootloader.changes src/generic/sections_widget.ycp
by juhliarik＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: juhliarik Date: Thu Jan 29 10:19:34 2009 New Revision: 55133 URL: http://svn.opensuse.org/viewcvs/yast?rev=55133&view=rev Log: added fix for using translated text for Image, Other Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes branches/SuSE-Code-11-Branch/bootloader/src/generic/sections_widget.ycp Modified: branches/SuSE-Code-11-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/VERSION (original) +++ branches/SuSE-Code-11-Branch/bootloader/VERSION Thu Jan 29 10:19:34 2009 @@ -1 +1 @@ -2.17.52 +2.17.53 Modified: branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Code-11-Branch/bootloader/package/yast2-bootloader.changes Thu Jan 29 10:19:34 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jan 29 10:08:57 CET 2009 - fero(a)suse.cz + +- added fix for using translated text in bootloader e.g. Image, + Other (bug #445999) +- 2.17.53 + +------------------------------------------------------------------- Tue Jan 27 17:14:25 CET 2009 - juhliarik(a)suse.cz - added fix for problem with adding boot entry to EFI if Modified: branches/SuSE-Code-11-Branch/bootloader/src/generic/sections_widget.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/bootloade… ============================================================================== --- branches/SuSE-Code-11-Branch/bootloader/src/generic/sections_widget.ycp (original) +++ branches/SuSE-Code-11-Branch/bootloader/src/generic/sections_widget.ycp Thu Jan 29 10:19:34 2009 @@ -81,13 +81,13 @@ ), ", " ); - // Upcase word 'type' - type = toupper(substring(type,0,1)) + substring(type,1); return `item (`id (name), BootCommon::globals["default"]:"" == name ? UI::Glyph (`CheckMark) : "", name, - type, + (type == "image") + ? _("Image") + : _("Other"), summary ); }); -- 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] r55132 - in /branches/tmp/lslezak/core: ./ agent-any/doc/ agent-dummy/doc/ agent-dummy/testsuite/ agent-ini/doc/ agent-modules/doc/ agent-process/doc/ agent-process/src/ agent-process/testsuite/lib...
by lslezak＠svn.opensuse.org 29 Jan '09

29 Jan '09

Author: lslezak Date: Thu Jan 29 08:58:52 2009 New Revision: 55132 URL: http://svn.opensuse.org/viewcvs/yast?rev=55132&view=rev Log: - merge - update the base to r55131 from trunk Added: branches/tmp/lslezak/core/base/tools/tty_wrapper/ (props changed) - copied from r55131, trunk/core/base/tools/tty_wrapper/ branches/tmp/lslezak/core/base/tools/tty_wrapper/Makefile.am - copied unchanged from r55131, trunk/core/base/tools/tty_wrapper/Makefile.am branches/tmp/lslezak/core/base/tools/tty_wrapper/tty_wrapper.cc - copied unchanged from r55131, trunk/core/base/tools/tty_wrapper/tty_wrapper.cc branches/tmp/lslezak/core/dbus/SCR_service/org.opensuse.yast.scr.policy - copied unchanged from r55131, trunk/core/dbus/SCR_service/org.opensuse.yast.scr.policy branches/tmp/lslezak/core/liby2/src/include/y2/exitcodes.h - copied unchanged from r55131, trunk/core/liby2/src/include/y2/exitcodes.h branches/tmp/lslezak/core/liby2util-r/src/include/y2util/y2changes.h - copied unchanged from r55131, trunk/core/liby2util-r/src/include/y2util/y2changes.h branches/tmp/lslezak/core/liby2util-r/src/y2changes.cc - copied unchanged from r55131, trunk/core/liby2util-r/src/y2changes.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinMultiset.cc - copied unchanged from r55131, trunk/core/libycp/src/YCPBuiltinMultiset.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinSymbol.cc - copied unchanged from r55131, trunk/core/libycp/src/YCPBuiltinSymbol.cc branches/tmp/lslezak/core/libycp/src/include/ycp/YCPBuiltinMultiset.h - copied unchanged from r55131, trunk/core/libycp/src/include/ycp/YCPBuiltinMultiset.h branches/tmp/lslezak/core/libycp/src/include/ycp/YCPBuiltinSymbol.h - copied unchanged from r55131, trunk/core/libycp/src/include/ycp/YCPBuiltinSymbol.h branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Multiset.err - copied unchanged from r55131, trunk/core/libycp/testsuite/tests/builtin/Builtin-Multiset.err branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Multiset.out - copied unchanged from r55131, trunk/core/libycp/testsuite/tests/builtin/Builtin-Multiset.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Multiset.ycp - copied unchanged from r55131, trunk/core/libycp/testsuite/tests/builtin/Builtin-Multiset.ycp branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err - copied unchanged from r55131, trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.err branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out - copied unchanged from r55131, trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp - copied unchanged from r55131, trunk/core/libycp/testsuite/tests/builtin/Builtin-Symbol.ycp Removed: branches/tmp/lslezak/core/liby2/doc/Y2-access.html.in branches/tmp/lslezak/core/liby2/doc/Y2-components.html.in branches/tmp/lslezak/core/liby2/doc/Y2-overview.html branches/tmp/lslezak/core/liby2/doc/componentbroker.txt branches/tmp/lslezak/core/liby2/doc/interface.txt Modified: branches/tmp/lslezak/core/ (props changed) branches/tmp/lslezak/core/SUBDIRS branches/tmp/lslezak/core/VERSION branches/tmp/lslezak/core/agent-any/doc/ag_anyagent.html (props changed) branches/tmp/lslezak/core/agent-dummy/doc/ag_dummy.html (props changed) branches/tmp/lslezak/core/agent-dummy/testsuite/Makefile.am branches/tmp/lslezak/core/agent-ini/doc/ag_ini.html (props changed) branches/tmp/lslezak/core/agent-modules/doc/ag_modules.html (props changed) branches/tmp/lslezak/core/agent-process/doc/ag_process.html (props changed) branches/tmp/lslezak/core/agent-process/src/Process.cc branches/tmp/lslezak/core/agent-process/src/Process.h branches/tmp/lslezak/core/agent-process/testsuite/lib/ag_process_init.exp branches/tmp/lslezak/core/agent-resolver/doc/ag_resolver.html (props changed) branches/tmp/lslezak/core/agent-system/src/SystemAgent.cc branches/tmp/lslezak/core/agents-perl/doc/ag_modinfo.html (props changed) branches/tmp/lslezak/core/agents-perl/doc/ag_yp_makefile.html (props changed) branches/tmp/lslezak/core/agents-perl/lib/ycp.pm branches/tmp/lslezak/core/autodocs/Makefile.am branches/tmp/lslezak/core/base/src/Makefile.am branches/tmp/lslezak/core/base/tools/Makefile.am branches/tmp/lslezak/core/base/tools/ycpc/Makefile.am branches/tmp/lslezak/core/configure.in.in branches/tmp/lslezak/core/dbus/SCR_service/ (props changed) branches/tmp/lslezak/core/dbus/SCR_service/DBusServer.cc branches/tmp/lslezak/core/dbus/SCR_service/Makefile.am branches/tmp/lslezak/core/dbus/SCR_service/org.opensuse.yast.SCR.conf.in branches/tmp/lslezak/core/libscr/src/SCR.cc branches/tmp/lslezak/core/libscr/testsuite/Makefile.am branches/tmp/lslezak/core/liby2/Makefile.am branches/tmp/lslezak/core/liby2/doc/Makefile.am branches/tmp/lslezak/core/liby2/src/genericfrontend.cc branches/tmp/lslezak/core/liby2/src/include/Y2.h branches/tmp/lslezak/core/liby2/src/include/y2/Makefile.am branches/tmp/lslezak/core/liby2/src/include/y2/Y2Component.h branches/tmp/lslezak/core/liby2/src/include/y2/Y2ComponentBroker.h branches/tmp/lslezak/core/liby2dbus/ (props changed) branches/tmp/lslezak/core/liby2dbus/src/DBusConn.cc (props changed) branches/tmp/lslezak/core/liby2dbus/src/DBusConn.h (props changed) branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.cc (props changed) branches/tmp/lslezak/core/liby2dbus/src/DBusMsg.h (props changed) branches/tmp/lslezak/core/liby2dbus/src/Makefile.am (props changed) branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc (contents, props changed) branches/tmp/lslezak/core/liby2dbus/src/PolKit.h (props changed) branches/tmp/lslezak/core/liby2util-r/src/ExternalProgram.cc branches/tmp/lslezak/core/liby2util-r/src/Makefile.am branches/tmp/lslezak/core/liby2util-r/src/include/y2util/ExternalProgram.h branches/tmp/lslezak/core/liby2util-r/src/include/y2util/Makefile.am branches/tmp/lslezak/core/liby2util-r/src/y2log.cc branches/tmp/lslezak/core/libycp/src/Makefile.am branches/tmp/lslezak/core/libycp/src/Scanner.cc branches/tmp/lslezak/core/libycp/src/Type.cc branches/tmp/lslezak/core/libycp/src/YBlock.cc branches/tmp/lslezak/core/libycp/src/YBuiltin.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinFloat.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinList.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinMap.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinMisc.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinString.cc branches/tmp/lslezak/core/libycp/src/YCPBuiltinTerm.cc branches/tmp/lslezak/core/libycp/src/YCPList.cc branches/tmp/lslezak/core/libycp/src/YCPMap.cc branches/tmp/lslezak/core/libycp/src/YCPString.cc branches/tmp/lslezak/core/libycp/src/YExpression.cc branches/tmp/lslezak/core/libycp/src/YStatement.cc branches/tmp/lslezak/core/libycp/src/include/YCP.h branches/tmp/lslezak/core/libycp/src/include/ycp/Makefile.am branches/tmp/lslezak/core/libycp/src/include/ycp/Parser.h branches/tmp/lslezak/core/libycp/src/include/ycp/YBlock.h branches/tmp/lslezak/core/libycp/src/include/ycp/YCPCodeCompare.h branches/tmp/lslezak/core/libycp/src/include/ycp/YCPList.h branches/tmp/lslezak/core/libycp/src/include/ycp/YCPMap.h branches/tmp/lslezak/core/libycp/src/include/ycp/YCPString.h branches/tmp/lslezak/core/libycp/src/include/ycp/YCode.h branches/tmp/lslezak/core/libycp/src/include/ycp/YStatement.h branches/tmp/lslezak/core/libycp/src/include/ycp/pathsearch.h branches/tmp/lslezak/core/libycp/src/include/ycp/ycpless.h branches/tmp/lslezak/core/libycp/src/pathsearch.cc branches/tmp/lslezak/core/libycp/testsuite/Makefile.am branches/tmp/lslezak/core/libycp/testsuite/runtest.sh branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Float.ycp branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.err branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.ycp branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.err branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map3.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.err branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.ycp branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-remove.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.err branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.out branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.ycp branches/tmp/lslezak/core/package/yast2-core.changes branches/tmp/lslezak/core/scr/src/ScriptingAgent.cc branches/tmp/lslezak/core/scr/src/StdioSCRAgent.cc branches/tmp/lslezak/core/scr/src/StdioSCRAgent.h branches/tmp/lslezak/core/wfm/src/WFM.cc branches/tmp/lslezak/core/wfm/src/Y2CCWFM.cc branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.cc branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.h branches/tmp/lslezak/core/wfm/testsuite/Makefile.am branches/tmp/lslezak/core/yast2-core.spec.in Modified: branches/tmp/lslezak/core/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/SUBDIRS?rev=… ============================================================================== --- branches/tmp/lslezak/core/SUBDIRS (original) +++ branches/tmp/lslezak/core/SUBDIRS Thu Jan 29 08:58:52 2009 @@ -1 +1 @@ -liby2util-r liby2 libycp liby2dbus libscr agent-dummy scr agent-system agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm base autodocs agent-process dbus +liby2util-r liby2 libycp liby2dbus libscr agent-dummy scr agent-system agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs dbus Modified: branches/tmp/lslezak/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/VERSION?rev=… ============================================================================== --- branches/tmp/lslezak/core/VERSION (original) +++ branches/tmp/lslezak/core/VERSION Thu Jan 29 08:58:52 2009 @@ -1 +1 @@ -2.17.9 +2.18.2 Modified: branches/tmp/lslezak/core/agent-dummy/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/agent-dummy/… ============================================================================== --- branches/tmp/lslezak/core/agent-dummy/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/core/agent-dummy/testsuite/Makefile.am Thu Jan 29 08:58:52 2009 @@ -12,11 +12,7 @@ noinst_PROGRAMS = y2ag_dummy y2ag_dummy_SOURCES = y2ag_dummy.cc -y2ag_dummy_LDADD = \ - ../../liby2/src/liby2.la \ - ../../libycp/src/libycp.la \ - ../../libscr/src/libscr.la \ - ${Y2UTIL_LIBS} +y2ag_dummy_LDADD = ${AGENT_LIBADD} y2ag_dummy_LDFLAGS = \ -Xlinker --whole-archive \ ../src/libpy2ag_dummy.la \ Modified: branches/tmp/lslezak/core/agent-process/src/Process.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/agent-proces… ============================================================================== --- branches/tmp/lslezak/core/agent-process/src/Process.cc (original) +++ branches/tmp/lslezak/core/agent-process/src/Process.cc Thu Jan 29 08:58:52 2009 @@ -242,3 +242,8 @@ return ExternalProgram::close(); } +FILE* Process::errorFile() +{ + return stderr_output; +} + Modified: branches/tmp/lslezak/core/agent-process/src/Process.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/agent-proces… ============================================================================== --- branches/tmp/lslezak/core/agent-process/src/Process.h (original) +++ branches/tmp/lslezak/core/agent-process/src/Process.h Thu Jan 29 08:58:52 2009 @@ -77,9 +77,9 @@ * @param default_locale whether to set LC_ALL=C before starting * @param use_pty start the process in a terminal */ - Process(const std::string &commandline, bool use_pty = false, bool default_locale = false) + Process(const std::string &commandline, bool use_pty = false, bool default_locale = false, bool pty_trans = true) : ExternalProgram(commandline, Stderr_To_FileDesc, - use_pty, create_stderr_pipes(), default_locale), stderr_output(NULL) + use_pty, create_stderr_pipes(), default_locale, "", pty_trans), stderr_output(NULL) {} /** @@ -88,9 +88,9 @@ * overwriting existing ones. */ - Process(const char *const *argv, const Environment &environment, bool use_pty = false, bool default_locale = false) + Process(const char *const *argv, const Environment &environment, bool use_pty = false, bool default_locale = false, bool pty_trans = true) : ExternalProgram(argv, environment, Stderr_To_FileDesc, - use_pty, create_stderr_pipes(), default_locale) + use_pty, create_stderr_pipes(), default_locale, "", pty_trans) {} @@ -145,6 +145,12 @@ * Read whether there are some buffered lines */ bool anyLineInStdout(); + + /** + * Return the stderror stream + */ + FILE* errorFile(); + }; #endif // Process_h Modified: branches/tmp/lslezak/core/agent-process/testsuite/lib/ag_process_init.exp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/agent-proces… ============================================================================== --- branches/tmp/lslezak/core/agent-process/testsuite/lib/ag_process_init.exp (original) +++ branches/tmp/lslezak/core/agent-process/testsuite/lib/ag_process_init.exp Thu Jan 29 08:58:52 2009 @@ -55,14 +55,22 @@ # check stderr if {[diff $stderr_name "tmp.err.$base_name"] != 1} { + puts "\nThe diff follows...\n" + puts [exec sh -c "diff -u $stderr_name tmp.err.$base_name || true"] + puts "" fail "Wrong stderr for $base_name" + puts "See the diff above." return -1 } # check stdout if {[diff $stdout_name "tmp.out.$base_name"] != 1} { + puts "\nThe diff follows...\n" + puts [exec sh -c "diff -u $stdout_name tmp.out.$base_name || true"] + puts "" fail "Wrong stdout for $base_name" + puts "See the diff above." return -1 } @@ -70,6 +78,9 @@ if {[find . "tests/$base_name.write"] == "./tests/$base_name.write"} { if {[diff "tests/$base_name.write" "tmp.write.$base_name"] != 1} { + puts "\nThe diff follows...\n" + puts [exec sh -c "diff -u tests/$base_name.write tmp.write.$base_name || true"] + puts "" fail "Wrong write for $base_name" return -1 } Modified: branches/tmp/lslezak/core/agent-system/src/SystemAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/agent-system… ============================================================================== --- branches/tmp/lslezak/core/agent-system/src/SystemAgent.cc (original) +++ branches/tmp/lslezak/core/agent-system/src/SystemAgent.cc Thu Jan 29 08:58:52 2009 @@ -275,14 +275,14 @@ { YCPMap map = value->asMap (); ret += "$["; - for (YCPMapIterator i = map->begin (); i != map->end (); i++) { + for (YCPMap::const_iterator i = map->begin(); i != map->end(); i++) { if ( i != map->begin () ) ret += ","; ret += "\n"; ret += indent_output (level+1); - ret += dump_value (level+1, i.key ()); + ret += dump_value (level+1, i->first); ret += " : "; - ret += dump_value (level+1, i.value ()); + ret += dump_value (level+1, i->second); } ret += "\n"; ret += indent_output (level); @@ -946,17 +946,18 @@ } string exports = ""; - for (YCPMapIterator pos = variables->begin(); pos != variables->end(); ++pos) + for (YCPMap::const_iterator pos = variables->begin(); pos != variables->end(); ++pos) { - YCPValue key = pos.key(); - YCPValue value = pos.value(); + const YCPValue& key = pos->first; + const YCPValue& value = pos->second; + if (!key->isString()) { return YCPError (string("Invalid value '") + key->toString() + "' for target variable name, which must be a string"); - } + exports += "export " + key->asString()->value() + "='"; string valstr; if (value->isString()) Modified: branches/tmp/lslezak/core/agents-perl/lib/ycp.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/agents-perl/… ============================================================================== --- branches/tmp/lslezak/core/agents-perl/lib/ycp.pm (original) +++ branches/tmp/lslezak/core/agents-perl/lib/ycp.pm Thu Jan 29 08:58:52 2009 @@ -761,8 +761,12 @@ sub BEGIN { $Y2DEBUG = $ENV{"Y2DEBUG"}; - - my @names = ( "/var/log/YaST2/y2log", "$ENV{HOME}/.y2log" ); + my $home = $ENV{"HOME"}; + my @names = ( "/var/log/YaST2/y2log" ); + if (defined ($home)) + { + push(@names, "$home/.y2log") + } if (defined ($ARGV[0]) && $ARGV[0] =~ /^(-l|--log)$/) { @names = ( $ARGV[1] ); Modified: branches/tmp/lslezak/core/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/autodocs/Mak… ============================================================================== --- branches/tmp/lslezak/core/autodocs/Makefile.am (original) +++ branches/tmp/lslezak/core/autodocs/Makefile.am Thu Jan 29 08:58:52 2009 @@ -13,5 +13,6 @@ index.html: $(wildcard $(top_srcdir)/*/*.cc $(top_srcdir)/*/*/*.cc) ${YDOXYGEN} PROJECT_NAME=@RPMNAME@ \ - INPUT=.. + INPUT=.. \ + EXCLUDE=../liby2util-r/testsuite # TODO: create libzypp.tag and use it (elsewhere) Modified: branches/tmp/lslezak/core/base/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/base/src/Mak… ============================================================================== --- branches/tmp/lslezak/core/base/src/Makefile.am (original) +++ branches/tmp/lslezak/core/base/src/Makefile.am Thu Jan 29 08:58:52 2009 @@ -10,6 +10,7 @@ ../../wfm/src/libpy2wfm.la \ ../../scr/src/libpy2scr.la \ ../../libycp/src/libycp.la \ + ../../libycp/src/libycpvalues.la \ ../../liby2/src/liby2.la \ ../../libscr/src/libscr.la Modified: branches/tmp/lslezak/core/base/tools/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/base/tools/M… ============================================================================== --- branches/tmp/lslezak/core/base/tools/Makefile.am (original) +++ branches/tmp/lslezak/core/base/tools/Makefile.am Thu Jan 29 08:58:52 2009 @@ -2,5 +2,5 @@ # Makefile.am for core/base/tools # -SUBDIRS = startshell autorun elf-arch ycpc devtools +SUBDIRS = startshell autorun elf-arch ycpc devtools tty_wrapper Modified: branches/tmp/lslezak/core/base/tools/ycpc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/base/tools/y… ============================================================================== --- branches/tmp/lslezak/core/base/tools/ycpc/Makefile.am (original) +++ branches/tmp/lslezak/core/base/tools/ycpc/Makefile.am Thu Jan 29 08:58:52 2009 @@ -15,6 +15,7 @@ bin_PROGRAMS = ycpc ycpc_SOURCES = ycpc.cc ycpc_LDADD = $(top_builddir)/libycp/src/libycp.la \ + $(top_builddir)/libycp/src/libycpvalues.la \ $(top_builddir)/wfm/src/libpy2wfm.la \ $(top_builddir)/liby2/src/liby2.la \ $(top_builddir)/libscr/src/libscr.la \ Modified: branches/tmp/lslezak/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/configure.in… ============================================================================== --- branches/tmp/lslezak/core/configure.in.in (original) +++ branches/tmp/lslezak/core/configure.in.in Thu Jan 29 08:58:52 2009 @@ -52,6 +52,7 @@ AGENT_LIBADD='dnl $(top_builddir)/libscr/src/libscr.la dnl $(top_builddir)/libycp/src/libycp.la dnl + $(top_builddir)/libycp/src/libycpvalues.la dnl $(top_builddir)/liby2/src/liby2.la dnl ${Y2UTIL_LIBS}' @@ -130,8 +131,6 @@ ## and generate the output AC_CONFIG_FILES([ - liby2/doc/Y2-access.html - liby2/doc/Y2-components.html scr/doc/SCR.html scr/doc/intro_to_scr.html ]) Modified: branches/tmp/lslezak/core/dbus/SCR_service/DBusServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/SCR_ser… ============================================================================== --- branches/tmp/lslezak/core/dbus/SCR_service/DBusServer.cc (original) +++ branches/tmp/lslezak/core/dbus/SCR_service/DBusServer.cc Thu Jan 29 08:58:52 2009 @@ -25,7 +25,8 @@ // ostringstream #include <sstream> -static bool finish = false; +// use atomic type in signal handler (see bnc#434509) +static sig_atomic_t finish = 0; DBusServer::DBusServer() @@ -426,7 +427,21 @@ { // create actionId static const char *polkit_prefix = "org.opensuse.yast.scr"; - std::string action_id(PolKit::createActionId(polkit_prefix, path, method, arg, opt)); + + // check the access right to all methods at first (see bnc#449794) + std::string action_id(PolKit::createActionId(polkit_prefix, "", method, "", "")); + + if (policykit.isDBusUserAuthorized(action_id, caller, connection.getConnection())) + { + y2security("User is authorized to do action %s", action_id.c_str()); + return true; + } + else + { + y2debug("User is NOT authorized to do action %s", action_id.c_str()); + } + + action_id = PolKit::createActionId(polkit_prefix, path, method, arg, opt); bool ret = false; Modified: branches/tmp/lslezak/core/dbus/SCR_service/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/SCR_ser… ============================================================================== --- branches/tmp/lslezak/core/dbus/SCR_service/Makefile.am (original) +++ branches/tmp/lslezak/core/dbus/SCR_service/Makefile.am Thu Jan 29 08:58:52 2009 @@ -2,7 +2,7 @@ # Makefile.am for dbus/service # -EXTRA_DIST=org.opensuse.yast.SCR.service.in org.opensuse.yast.SCR.conf.in +EXTRA_DIST=org.opensuse.yast.SCR.service.in org.opensuse.yast.SCR.conf.in org.opensuse.yast.scr.policy AM_CXXFLAGS = -DY2LOG=\"SCR-service\" -DSUSEVERSION=\"${SUSEVERSION}\" @@ -16,6 +16,14 @@ SCR_dbus_server_LDADD = ${AGENT_LIBADD} $(top_builddir)/liby2dbus/src/liby2dbus.la $(top_builddir)/scr/src/libpy2scr.la +# PolicyKit defaults +polkit_policiesdir = `pkg-config --print-errors --variable policydir polkit` +polkit_policies_DATA = org.opensuse.yast.scr.policy + +# validate the policy files in 'make check' target +check-local: + polkit-policy-file-validate $(polkit_policies_DATA) + # service activation config Modified: branches/tmp/lslezak/core/dbus/SCR_service/org.opensuse.yast.SCR.conf.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/SCR_ser… ============================================================================== --- branches/tmp/lslezak/core/dbus/SCR_service/org.opensuse.yast.SCR.conf.in (original) +++ branches/tmp/lslezak/core/dbus/SCR_service/org.opensuse.yast.SCR.conf.in Thu Jan 29 08:58:52 2009 @@ -1,11 +1,20 @@ <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> + <policy user="root"> <allow own="org.opensuse.yast.SCR"/> - <allow send_interface="org.opensuse.yast.SCR.Methods"/> + <allow send_destination="org.opensuse.yast.SCR"/> </policy> <policy context="default"> - <deny own="org.opensuse.yast.SCR"/> - <@ACCESS_MODE@ send_interface="org.opensuse.yast.SCR.Methods"/> +  + <@ACCESS_MODE@ send_destination="org.opensuse.yast.SCR" + send_interface="org.opensuse.yast.SCR.Methods"/> +  + <allow send_destination="org.opensuse.yast.SCR" + send_interface="org.freedesktop.DBus.Introspectable" /> </policy> </busconfig> Modified: branches/tmp/lslezak/core/libscr/src/SCR.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libscr/src/S… ============================================================================== --- branches/tmp/lslezak/core/libscr/src/SCR.cc (original) +++ branches/tmp/lslezak/core/libscr/src/SCR.cc Thu Jan 29 08:58:52 2009 @@ -140,7 +140,9 @@ } static YCPValue -SCRWrite2 (const YCPPath &path, const YCPValue& value) { +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); @@ -156,7 +158,10 @@ } static YCPValue -SCRWrite3 (const YCPPath &path, const YCPValue& value, const YCPValue& arg) { +SCRWrite3 (const YCPPath &path, const YCPValue& value_n, const YCPValue& arg_n) { + 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); @@ -222,7 +227,9 @@ } static YCPValue -SCRExecute2 (const YCPPath &path, const YCPValue &arg) { +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); @@ -235,13 +242,16 @@ } y2debug( "Running SCR::Execute on SCR agent %p", SCRAgent::instance () ); y2debug( "path: %s", path->toString ().c_str () ); - y2debug( "args: %s", arg.isNull () ? "null" : arg->toString ().c_str () ); + y2debug( "args: %s", arg->toString ().c_str () ); return SCRAgent::instance ()->Execute (path, arg); } static YCPValue -SCRExecute3 (const YCPPath &path, const YCPValue &arg, const YCPValue &opt) { +SCRExecute3 (const YCPPath &path, const YCPValue &arg_n, const YCPValue &opt_n) { + 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); @@ -254,7 +264,7 @@ } y2debug( "Running SCR::Execute on SCR agent %p", SCRAgent::instance () ); y2debug( "path: %s", path->toString ().c_str () ); - y2debug( "args: %s,%s", arg.isNull () ? "null" : arg->toString ().c_str (), opt.isNull () ? "null" : opt->toString ().c_str () ); + y2debug( "args: %s,%s", arg->toString ().c_str (), opt->toString ().c_str () ); return SCRAgent::instance ()->Execute (path, arg, opt); } Modified: branches/tmp/lslezak/core/libscr/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libscr/tests… ============================================================================== --- branches/tmp/lslezak/core/libscr/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/core/libscr/testsuite/Makefile.am Thu Jan 29 08:58:52 2009 @@ -12,7 +12,7 @@ noinst_PROGRAMS = runscr runscr_SOURCES = runscr.cc -runscr_LDADD = ../src/libscr.la ../../liby2/src/liby2.la ../../libycp/src/libycp.la ${Y2UTIL_LIBS} ../../liby2dbus/src/liby2dbus.la +runscr_LDADD = ${AGENT_LIBADD} ../../liby2dbus/src/liby2dbus.la PACKAGE = libscr AUTOMAKE_OPTIONS = dejagnu Modified: branches/tmp/lslezak/core/liby2/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/Makefi… ============================================================================== --- branches/tmp/lslezak/core/liby2/Makefile.am (original) +++ branches/tmp/lslezak/core/liby2/Makefile.am Thu Jan 29 08:58:52 2009 @@ -2,4 +2,4 @@ # Makefile.am for core/liby2 # -SUBDIRS = src doc +SUBDIRS = src Modified: branches/tmp/lslezak/core/liby2/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/doc/Ma… ============================================================================== --- branches/tmp/lslezak/core/liby2/doc/Makefile.am (original) +++ branches/tmp/lslezak/core/liby2/doc/Makefile.am Thu Jan 29 08:58:52 2009 @@ -7,9 +7,6 @@ htmldir = $(docdir)/liby2 html_DATA = \ - Y2-access.html Y2-components.html \ - Y2-overview.html \ - componentbroker.txt \ README.componentsearch EXTRA_DIST = $(html_DATA) Modified: branches/tmp/lslezak/core/liby2/src/genericfrontend.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/src/ge… ============================================================================== --- branches/tmp/lslezak/core/liby2/src/genericfrontend.cc (original) +++ branches/tmp/lslezak/core/liby2/src/genericfrontend.cc Thu Jan 29 08:58:52 2009 @@ -14,17 +14,75 @@ Authors: Mathias Kettner <kettner(a)suse.de> Arvin Schnell <arvin(a)suse.de> + Stanislav Visnovsky <visnov(a)suse.cz> Maintainer: Arvin Schnell <arvin(a)suse.de> /-*/ -/* - * main function common to all Y2 components - */ - #ifndef _GNU_SOURCE #define _GNU_SOURCE // needed for vasprintf below #endif +/** + * \file + * Generic \ref main function handler for all YaST2 applications. + */ + +/** + * \mainpage Welcome to YaST2 Core System + * + * \section intro Introduction + * + * This is the main page of the YaST2 Core documentation. YaST Core is a generic component-based + * system to provide the infrastructure for implementing functionality of the YaST + * installation and configuration tool. + * + * \section whatis What is YaST2 Core? + * + * YaST Core is a collection of libraries to provide an infrastructure for rapid + * development of configuration tools. It is a component-based, cross-language + * system. + * + * Some of the general topics are covered by the following pages: + * + * - Component architecture + * - \ref components + * - \ref componentbroker + * - \ref componentsearch + * + * - Handling of error codes: \ref exitcodes + * + * - Libraries + * - \ref liby2 + * - \ref libycp + * - \ref libscr + * + * - Generic components + * - \ref SCR + * - \ref WFM + * + * \section community Join the community + * + * Visit our web site at : http://en.opensuse.org/YaST or #yast on irc.freenode.net + * + * \section License + * + * YaST is licensed under GPL v2. + * + */ + +/** + * \page exitcodes YaST2 Exit Codes + * + * All applications using liby2 library share a common \ref main function. The function handles the exit codes in the following way. + * + * The exit codes are described in \ref exitcodes.h header file. A special handling is applied to the value returned from the client. + * - If a value is \ref YCPNull or \ref YCPVoid, exitcode \ref YAST_OK will be used. + * - If the value is \ref YCPBoolean, \ref YAST_OK will be returned for true, \ref YAST_CLIENTRESULT for false. + * - If the value is \ref YCPInteger, the value will be added to \ref YAST_CLIENTRESULT and the resulting + * integer will be the process exitcode. + * - If the value is \ref YCPSymbol, for names defined by \ref ycp_error_exit_symbols \ref YAST_CLIENTRESULT + * will be returned, otherwise \ref YAST_OK. + */ #include <stdarg.h> #include <unistd.h> #include <signal.h> @@ -44,12 +102,21 @@ #include <YCP.h> #include <ycp/Parser.h> #include <ycp/pathsearch.h> +#include "exitcodes.h" + +/// number of symbols that are handled as error codes +#define MAX_YCP_ERROR_EXIT_SYMBOLS 2 + +/// symbol names that are handled as error codes when returned by the client +const char* ycp_error_exit_symbols[MAX_YCP_ERROR_EXIT_SYMBOLS] = { + "abort", + "cancel" +}; using std::string; ExecutionEnvironment ee; -static const int YCP_ERROR = 16; - +/// fallback name of the program static const char *progname = "genericfrontend"; static void print_usage (); @@ -262,7 +329,7 @@ if (!argv[arg]) { print_usage (); - exit (1); + exit (YAST_FEWARGUMENTS); } client_name = argv[arg]; @@ -299,13 +366,13 @@ if (option.isNull()) { print_error ("Client option -s: Couldn't parse valid YCP value from stdin"); - exit (5); + exit (YAST_OPTIONERROR); } if (!option->isList()) { print_error ("Client option -s: Parsed YCP value is NOT a YCPList"); - exit (5); + exit (YAST_OPTIONERROR); } arglist = option->asList(); // the option read _IS_ arglist @@ -387,13 +454,13 @@ { fprintf(stderr, "No server module given\n"); print_usage (); - exit (5); + exit (YAST_OPTIONERROR); } // now create server if (!argv[arg]) { print_usage (); - exit (1); + exit (YAST_FEWARGUMENTS); } server_name = argv[arg]; @@ -477,7 +544,7 @@ if (!argv[0]) { fprintf (stderr, "Missing argv[0]. It is a NULL pointer."); - exit (5); + exit (YAST_OPTIONERROR); } progname = basename (argv[0]); // get program name @@ -501,12 +568,12 @@ if (argc < 2) { fprintf (stderr, "\nToo few arguments"); print_usage(); - exit (1); + exit (YAST_FEWARGUMENTS); } if (!strcmp (argv[1], "-h") || !strcmp (argv[1], "--help")) { print_help (); - exit (0); + exit (YAST_OK); } // client _AND_ server must be given @@ -591,7 +658,7 @@ if (pos == NULL) { print_error ("Option %s argument must be in format namespace=component", argv[arg-1]); - exit (5); + exit (YAST_OPTIONERROR); } *pos = 0; Y2ComponentBroker::registerNamespaceException (argv[arg], pos+1); @@ -689,12 +756,12 @@ fprintf (stderr, " %s\n", i->c_str()); print_usage (); - exit (5); + exit (YAST_OPTIONERROR); } if (dynamic_cast<Y2ErrorComponent *>(client)) { print_error ("Error while creating client module %s", client_name); - exit (5); + exit (YAST_OPTIONERROR); } @@ -729,10 +796,30 @@ // might be useful in tracking segmentation faults y2milestone ("Finished YaST2 component '%s'", progname); - if( !result.isNull () && result->isBoolean() ) - exit( result->asBoolean()->value() ? 0 : YCP_ERROR ); + if( result.isNull () ) + exit (YAST_OK); - exit (EXIT_SUCCESS); + y2milestone( "Exiting with client return value '%s'", result->toString ().c_str ()); + + if( result->isBoolean () ) + { + exit( result->asBoolean()->value() ? YAST_OK : YAST_CLIENTRESULT ); + } + + if( result->isInteger () ) + exit( YAST_CLIENTRESULT + result->asInteger ()->value () ); + + // if it is one of error symbols, return it as error + if( result->isSymbol () ) + { + string symbol = result->asSymbol()->symbol(); + for( int i = 0 ; i < MAX_YCP_ERROR_EXIT_SYMBOLS; i++ ) + if( symbol == ycp_error_exit_symbols[i] ) + exit( YAST_CLIENTRESULT ); + } + + // all other values + exit (YAST_OK); } Modified: branches/tmp/lslezak/core/liby2/src/include/Y2.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/src/in… ============================================================================== --- branches/tmp/lslezak/core/liby2/src/include/Y2.h (original) +++ branches/tmp/lslezak/core/liby2/src/include/Y2.h Thu Jan 29 08:58:52 2009 @@ -26,7 +26,9 @@ #include <y2/Y2ComponentCreator.h> #include <y2/Y2ComponentBroker.h> -/*** +/** + * \page liby2 liby2 Library + * * <h2>The YaST2 component architecture</h2> * * <p>The YaST2 system consists of different components. These are @@ -53,9 +55,9 @@ * time and provide single isolated binaries as well as clusters of components, that need * not be disjunct. * - * <h2>The generic frontend (GF)</h2> + * <h2>The generic frontend (y2base)</h2> * - * <p>The liby2 provides a main function. A component linked to liby2 + * <p>The liby2 provides a \ref main function. A component linked to liby2 * therefore need not and cannot have its own main function. This * generic main function does: * @@ -64,36 +66,29 @@ * <li>find the server and the client component regardless, whether they are realized * as external programs, * shared library plugins, YCP scripts or objects that are linked to the main binary</li> - * <li>parameter checking (not yet implemented) + * <li>parameter checking * <li>launches the server and the client component with the correct paramters</li> * <li>start the communication between client and server</li> * </ul> * * <p>A YaST2 binary does always consist of the generic frontend and zero or more - * components that are linked in. The binary <tt>y2gf</tt> just contains the frontend + * components that are linked in. The binary <tt>y2base</tt> just contains the frontend * and the builtin components <tt>cat</tt> and <tt>stdio</tt>. <tt>cat</tt> is * a server component that can be used instead of a user interface. It simply prints * all commands it gets to stdout and waits for the answer at stdin. <tt>stdio</tt> * works similary, but is a client. * * <p>The general synopsis of a call of a YaST2 binary is: - * <pre>y2gf [server] client [client-options] [server-options]</pre> + * <pre>y2base client server [client-options] [server-options]</pre> * * <p><font size="-1">( Please don't ask yet, why the server-options are stated <i>after</i> * the client options. We will see later. )</font> </p> * * <p>An example would be: - * <pre>y2gf qt mainmenu</pre> + * <pre>y2base menu qt</pre> * * <p>This call would use the component <tt>qt</tt>, which is the Qt-lib base graphical - * user interface, as display server and start the module <tt>mainmenu</tt>. - * - * <p>If the name of the YaST2 binary is not equal to <tt>y2gf</tt>, then the name - * without the <tt>y2</tt> is used as the name of the first component: - * <pre>y2qt mainmenu</pre> - * <p>This call does the same as the upper one. The generic frontend contained in <tt>y2qt</tt> - * first looks for a builtin (linked against) component named <tt>qt</tt>. If it finds one - * <i>in itself</i>, it does not have to launch an external program component. + * user interface, as display server and start the module <tt>menu</tt>. * * <h3>Server options</h3> * <p>Every command line argument Modified: branches/tmp/lslezak/core/liby2/src/include/y2/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/src/in… ============================================================================== --- branches/tmp/lslezak/core/liby2/src/include/y2/Makefile.am (original) +++ branches/tmp/lslezak/core/liby2/src/include/y2/Makefile.am Thu Jan 29 08:58:52 2009 @@ -14,7 +14,8 @@ Y2SerialComponent.h Y2StdioComponent.h \ Y2PluginComponent.h Y2CCPlugin.h \ Y2Namespace.h \ - Y2Function.h SymbolEntry.h + Y2Function.h SymbolEntry.h \ + exitcodes.h #<INSTALL-HEADER-TARGET> Modified: branches/tmp/lslezak/core/liby2/src/include/y2/Y2Component.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/src/in… ============================================================================== --- branches/tmp/lslezak/core/liby2/src/include/y2/Y2Component.h (original) +++ branches/tmp/lslezak/core/liby2/src/include/y2/Y2Component.h Thu Jan 29 08:58:52 2009 @@ -33,8 +33,195 @@ class YCPList; /** + * \page components YaST2 Component Architecture + * + * \author Mathias Kettner + * + * \todo This is partially obsolete! + * + * <h2>Design principles</h2> + * + * <p>The YaST2 component model is the foundation of the + * YaST2 architecture. It is important to understand at least + * the basic ideas in order to be able to write new Y2 components. + * It's based upon the following design principles: + * + * <p><table cellspacing=0 BGCOLOR="#f96500" width="100%"><tr><td> + * <table width="100%" bgcolor="#ffc080" cellpadding=10><TR><TD> + * <ul> + * + * <p><li><i>YaST2 should be easily extensable. One should be able + * to exchange or add functionality independent + * of all other parts.</i>This leads to a modular architecture. + * The interchangable parts are called 'components'.</li> + * + * <p><li><i>It should be possible, that a component can be added + * or exchanged merely through the fact, that a file has been + * added or exchanged.</i> This allows you to put configuration + * modules for a software into the same package as that software. + * For example you could write a configuration module for + * sendmail and put it into the sendmail package. As long as + * the sendmail package is installed, its YaST2 configuration + * module is available.</li> + * + * <p><li><i>Despite the need for Y2 to be modular in concept, + * during execution time this should not lead to high communication + * overhead or large need in memory usage or the number of + * concurrently running processes.</i></li> + * + * <p><li><i>The inter-component communication should be human + * readable, at least in debugging situations.</i></li> + * + * <p><li><i>The inter-component communication should be network + * transparent.</i></li> + * + * <p><li><i>It should be easy to write a component. Component implementing + * should not be restricted to a certain programming language.</i> + * + * </ul> + * </td></tr></table> + * </td></tr></table> + * + * <h2>Communication</h2> + * + * <p>All components speak a common language and act according to + * defined protocol. Both the language and the protocol are + * called <i>YCP (YaST2 communication protocol)</i>. One protocol + * step consists of one of the partners sending exactly one + * of \ref ycpvalues to the other and the other receiving that value. In the + * next step, the component that just was receiving, is now sending and + * vice versa. The only exception is, that one of that partners + * may terminate the session and send a last <i>result</i> message + * after which - of course - the partner won't send another value. + * + * <h2>Clients and Servers</h2> + * + * <p>There are two different kinds of components: server components and + * client components, which differ in how the control flows. + * + * <p>A <i>server</i> component is one that - once it's initialized - + * just waits for jobs to do. Another component can send a <i>request</i> + * and thus pass the control to the server. That does what is neccessary + * in order to do handle the request and returns an + * <i>answer</i>. Prominent examples for server components are the user + * interfaces. In YaST2 they play a <i>passive</i> role. They just wait + * for a command like "Show me this dialog, wait for the next user + * input and return me that input". A server component can also use + * the service of another server component. For example the <i>SCR + * (System configuration repository)</i> makes use of servers called + * <i>agents</i>, which realize subtrees of the SCR tree. + * + * <p>A <i>client</i> component is one that controls the flow. It may + * contain something like an "event loop". In order to do its + * work, it can use the services of other server components. Client + * components are sometimes called <i>modules</i>. Examples for + * modules are the single steps of the YaST2 "Installation + * Wizard" or the program that calls <tt>rpm</tt> to install + * packages. Other examples could be a module that configures the network + * setup of a workstation or one, that just sets the IP-number and the + * hostname of that workstation. + * + * <p>Modules can be hiearchically structured + * and hand over control to other modules that acomplish sub tasks and + * are called <i>submodules</i> in this context. An example is the + * structure of the YaST2 installer. The installation itself is + * a module. For each of the wizard window steps, it calls a submodule. + * + * <h2>How components are realized</h2> + * <p>There are quite a number of ways how you can implement a component. + * A component can be: + * <p><table cellspacing=0 BGCOLOR="#f96500" width="100%"><tr><td> + * <table width="100%" bgcolor="#ffc080" cellpadding=10><TR><TD> + * <ul> + * + * <li>An executable program (ELF, /bin/sh, or whatsoever)</li> + * <li>A C++ class using \ref libycp and \ref liby2</li> + * <li>A YCP script executed by the <i>Workflowmanager</i></li> + * <li>Youself typing some YCP code at a terminal</li> + * + * </ul> + * </td></tr></table> + * </td></tr></table> + * + * <p>Don't laugh over the last possibility! For debugging this is sometimes + * very helpful. You can simulate <i>any</i> component by typing to a terminal. + * + * <h3>Executable programs</h3> + * + * <p>A component that exists as <i>executable program</i> is realized by + * a process that is created when the component is needed. If a component + * needs the services of an external program component, it launches a + * seperate process and starts a communication via two unix pipes, one in + * each direction. + * + * <p>The data flowing through these pipes is YCP Ascii + * representation. Each communication side needs a parser to analyse the + * data and a YCP syntax generater to write data to the pipe. Both can be + * found in the \ref libycp, which can only used from C++ programs. + * + * <p>But the production of YCP code + * can in many cases very easily be done be printing to stdout, for + * example with <tt>echo</tt> (shell) or <tt>printf</tt> (C). + * + * <p>The parsing of YCP code is as bit more tricky. But in many cases you + * don't need a full featured parser, because you know beforehand what structure + * the value have that you get. This especially holds for client components, + * because they can decide, how the output from the server should look like. + * + * <h3>C++ class using libycp and liby2</h3> + * <p>If you anyway decide to write your component in C++, + * it's by far the most conveniant way to use the functionality + * of libycp and liby2, whose only purpose is excactly to support + * component implementation. + * + * <p>What you have to do is to subclass at least two classes: + * \ref Y2ComponentCreator and \ref Y2Component and + * + * <p>Depending on whether you want to implement a server or a client component + * you have to override different methods. Many examples can be found within the liby2 + * itself. + * + * <p>One big advantage of writing a component in C++ is, that + * you can very easily create three external appearances of the component: + * <ul> + * <li>A selfcontained executable program</li> + * <li>A shared library plugin to load during runtime</li> + * <li>A static library that can be linked together with other components</li> + * </ul> + * + * <p>The YaST2 installer makes usage of the third variant only. All required components + * are linked together to <tt>y2base</tt>, which is statically linked against liby2 and + * libycp. The memory usage is reduced as well as the required disk space. Furthermore + * no creating and parsing of Ascii streams between the components is required. Protocol + * steps are simple function calls. Even for very large data structures, only one pointer + * has to be passed. + * + * <h3>A YCP script executed by the <i>Workflowmanager</i></h3> + * <p>If you have installed YaST2, you will find some files ending in <tt>.ycp</tt> + * lying around in <tt>/lib/YaST2/clients</tt>. These are YCP scripts implementing + * client components (modules). YCP is not only a protocol, it is also a full features + * programming language, which is in this case used to implement components. This is + * very conveniant as the language can directly operate on the protocol values and + * has some other nice features. + * + * <p>The client scripts are executed by the <i>Workflowmanager</i>, which is an + * extension to the core YCP language. It implements a couple of builtin functions + * that allow communication the the system and with other + * components. Here is a + * <a href="../y2wfm/YCP-builtins-wfm.html">of builtins.</a>. + * + * <h3>Youself typing YCP code at a terminal</h3> + * <p>You can be a component yourself :-). Just tell another component to communicate + * via stdio and speak with it. For example you can launch the component <tt>ycp</tt> by + * typing <tt>y2ycp stdio</tt>. Now you can enter YCP expressions and get the evaluation + * as answer. + */ + +/** * @short Communication handle to a YaST2 component. - * @see Y2ComponentBroker. + * @see componentbroker + * @see Y2ComponentBroker + * * YaST2 is a network oriented client/server architecture. * Currently there exist five differnt types of components: * userinterfaces, modules, the workflowmanagers, the Modified: branches/tmp/lslezak/core/liby2/src/include/y2/Y2ComponentBroker.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2/src/in… ============================================================================== --- branches/tmp/lslezak/core/liby2/src/include/y2/Y2ComponentBroker.h (original) +++ branches/tmp/lslezak/core/liby2/src/include/y2/Y2ComponentBroker.h Thu Jan 29 08:58:52 2009 @@ -34,6 +34,41 @@ class Y2Component; /** + * \page componentbroker YaST2 Component Broker + * \author Matthias Kettner + * \todo clean up and update + * + * <h2>How the component broker works</h2> + * + * liby2 is the library which does all the stuff + * + * in \ref Y2ProgramComponent.cc the server/client is started + * (\ref launchExternalProgram) by connecting pipes for stdin/stdout + * and starting the program via fork/execve. + * + * The program is searched via \ref pathsearch.cc and must reside + * in a sub-directory "clients" or "servers". + * The $HOME directory is a special case, as a sub-dir $HOME/.yast2 + * must exists. + * + * Every program starts via \ref main() \ref genericfrontend.cc + * + * The \ref main() function parses argv and starts + * the client (\ref Y2ComponentBroker::createClient) and the + * server (\ref Y2ComponentBroker::createServer) for the component + * + * Expressions are 'commands' to the server and sent via + * "...Component::evaluate (const YCPValue& command)" + * + * evaluate() starts the 'real' component if it is not already + * running. + * + * \ref doActualWork() is used for client components + * + * \ref result() is used to finish server components + */ + +/** * @short Looks for and creates YaST2 components * This class has no instances and only static methods. * There are two reasons for this: @@ -50,6 +85,8 @@ * exist. During global constructor call time (before main), the * constructors of the @ref ComponentCreator classes <i>register</i> * themselves to the component broker. + * + * For more details, see \page componentbroker */ class Y2ComponentBroker { Modified: branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc Thu Jan 29 08:58:52 2009 @@ -25,11 +25,22 @@ y2debug("Checking action %s from %s", action_id.c_str(), dbus_caller.c_str()); PolKitCaller *pk_caller = polkit_caller_new_from_dbus_name(con, dbus_caller.c_str(), &dbus_error); + if (dbus_error_is_set (&dbus_error)) { - y2error ("dbus error: %s: %s", dbus_error.name, dbus_error.message); + // PolKit sometimes sets the error even if the PolKitCaller object has been successfully returned + // see bnc#439150 + if (pk_caller == NULL) + { + y2error ("dbus error: %s: %s", dbus_error.name, dbus_error.message); + } + dbus_error_free (&dbus_error); - return false; + + if (pk_caller == NULL) + { + return false; + } } if (pk_caller == NULL) Modified: branches/tmp/lslezak/core/liby2util-r/src/ExternalProgram.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2util-r/… ============================================================================== --- branches/tmp/lslezak/core/liby2util-r/src/ExternalProgram.cc (original) +++ branches/tmp/lslezak/core/liby2util-r/src/ExternalProgram.cc Thu Jan 29 08:58:52 2009 @@ -25,6 +25,7 @@ #include <fcntl.h> #include <pty.h> // openpty #include <stdlib.h> // setenv +#include <termios.h> // tcsetattr() #include <cstring> // strsignal @@ -36,8 +37,8 @@ ExternalProgram::ExternalProgram (string commandline, Stderr_Disposition stderr_disp, bool use_pty, int stderr_fd, bool default_locale, - const Pathname& root) - : use_pty (use_pty) + const Pathname& root, bool pty_trans) + : use_pty (use_pty), disable_pty_trans(!pty_trans) { const char *argv[4]; argv[0] = "/bin/sh"; @@ -58,8 +59,8 @@ ExternalProgram::ExternalProgram (const char *const *argv, Stderr_Disposition stderr_disp, bool use_pty, int stderr_fd, bool default_locale, - const Pathname& root) - : use_pty (use_pty) + const Pathname& root, bool pty_trans) + : use_pty (use_pty), disable_pty_trans(!pty_trans) { const char* rootdir = NULL; if(!root.empty() && root != "/") @@ -74,8 +75,8 @@ ExternalProgram::ExternalProgram (const char *const *argv, const Environment & environment, Stderr_Disposition stderr_disp, bool use_pty, int stderr_fd, bool default_locale, - const Pathname& root) - : use_pty (use_pty) + const Pathname& root, bool pty_trans) + : use_pty (use_pty), disable_pty_trans(!pty_trans) { const char* rootdir = NULL; if(!root.empty() && root != "/") @@ -87,8 +88,8 @@ ExternalProgram::ExternalProgram (const char *binpath, const char *const *argv_1, - bool use_pty) - : use_pty (use_pty) + bool use_pty, bool pty_trans) + : use_pty (use_pty), disable_pty_trans(!pty_trans) { int i = 0; while (argv_1[i++]) @@ -102,8 +103,8 @@ ExternalProgram::ExternalProgram (const char *binpath, const char *const *argv_1, const Environment & environment, - bool use_pty) - : use_pty (use_pty) + bool use_pty, bool pty_trans) + : use_pty (use_pty), disable_pty_trans(!pty_trans) { int i = 0; while (argv_1[i++]) @@ -119,6 +120,39 @@ { } +// disable LF to CRLF translation on the terminal file descriptor +// see 'man termios' or stty.c in core-utils for more info +bool ExternalProgram::disableCRLFTranslation(int fd) +{ + if (!isatty(fd)) + { + ERR << "The file descriptor is not a terminal!\n"; + return false; + } + + // properties of the terminal + struct termios mode; + + // get the current attributes + if (tcgetattr(fd, &mode)) + { + ERR << "tcgetattr() failed: " << strerror(errno) << endl; + return false; + } + + // disable the LF to CRLF translation in the output flag + mode.c_oflag = mode.c_oflag & ~ONLCR; + + // TCSADRAIN should be used when changing output flags (see 'man termios') + if (tcsetattr(fd, TCSADRAIN, &mode)) + { + ERR << "tcsetattr() failed: " << strerror(errno) << endl; + return false; + } + + return true; +} + void ExternalProgram::start_program (const char *const *argv, const Environment & environment, @@ -139,6 +173,11 @@ ERR << "openpty failed" << endl; return; } + + if (disable_pty_trans) + { + disableCRLFTranslation(slave_tty); + } } else { Modified: branches/tmp/lslezak/core/liby2util-r/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2util-r/… ============================================================================== --- branches/tmp/lslezak/core/liby2util-r/src/Makefile.am (original) +++ branches/tmp/lslezak/core/liby2util-r/src/Makefile.am Thu Jan 29 08:58:52 2009 @@ -22,7 +22,8 @@ Y2SLog.cc \ miniini.cc \ stringutil.cc \ - y2log.cc + y2log.cc \ + y2changes.cc liby2util_la_LDFLAGS = -version-info 4:0:0 Modified: branches/tmp/lslezak/core/liby2util-r/src/include/y2util/ExternalProgram.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2util-r/… ============================================================================== --- branches/tmp/lslezak/core/liby2util-r/src/include/y2util/ExternalProgram.h (original) +++ branches/tmp/lslezak/core/liby2util-r/src/include/y2util/ExternalProgram.h Thu Jan 29 08:58:52 2009 @@ -64,7 +64,7 @@ ExternalProgram (std::string commandline, Stderr_Disposition stderr_disp = Normal_Stderr, bool use_pty = false, int stderr_fd = -1, bool default_locale = false, - const Pathname& root = ""); + const Pathname& root = "", bool pty_trans = true); /** * Start an external program by giving the arguments as an arry of char *pointers. @@ -74,19 +74,19 @@ ExternalProgram (const char *const *argv, Stderr_Disposition stderr_disp = Normal_Stderr, bool use_pty = false, int stderr_fd = -1, bool default_locale = false, - const Pathname& root = ""); + const Pathname& root = "", bool pty_trans = true); ExternalProgram (const char *const *argv, const Environment & environment, Stderr_Disposition stderr_disp = Normal_Stderr, bool use_pty = false, int stderr_fd = -1, bool default_locale = false, - const Pathname& root = ""); + const Pathname& root = "", bool pty_trans = true); ExternalProgram (const char *binpath, const char *const *argv_1, - bool use_pty = false); + bool use_pty = false, bool pty_trans = true); ExternalProgram (const char *binpath, const char *const *argv_1, const Environment & environment, - bool use_pty = false); + bool use_pty = false, bool pty_trans = true); ~ExternalProgram(); @@ -124,6 +124,12 @@ */ bool use_pty; + /** + * Set to true if LF to CRLF output tranformation on the pty + * will be disabled + */ + bool disable_pty_trans; + pid_t pid; int _exitStatus; @@ -132,6 +138,8 @@ int stderr_fd = -1, bool default_locale = false, const char* root = NULL); + // disable LF to CRLF translation on the terminal file descriptor + bool disableCRLFTranslation(int fd); }; #endif // ExternalProgram_h Modified: branches/tmp/lslezak/core/liby2util-r/src/include/y2util/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2util-r/… ============================================================================== --- branches/tmp/lslezak/core/liby2util-r/src/include/y2util/Makefile.am (original) +++ branches/tmp/lslezak/core/liby2util-r/src/include/y2util/Makefile.am Thu Jan 29 08:58:52 2009 @@ -19,7 +19,8 @@ Y2SLog.h \ miniini.h \ stringutil.h \ - y2log.h + y2log.h \ + y2changes.h #<INSTALL-HEADER-TARGET> Modified: branches/tmp/lslezak/core/liby2util-r/src/y2log.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2util-r/… ============================================================================== --- branches/tmp/lslezak/core/liby2util-r/src/y2log.cc (original) +++ branches/tmp/lslezak/core/liby2util-r/src/y2log.cc Thu Jan 29 08:58:52 2009 @@ -72,14 +72,16 @@ inisection logconf; static bool did_set_logname = false; -static bool did_read_logconf = false; +// use atomic type in signal handler (see bnc#434509) +static sig_atomic_t did_read_logconf = 0; static const char *logname; static off_t maxlogsize; static int maxlognum; -static bool log_debug = false; +// use atomic type in signal handler (see bnc#434509) +static sig_atomic_t log_debug = false; static bool log_to_file = true; static bool log_to_syslog = false; Modified: branches/tmp/lslezak/core/libycp/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/M… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/Makefile.am (original) +++ branches/tmp/lslezak/core/libycp/src/Makefile.am Thu Jan 29 08:58:52 2009 @@ -45,7 +45,8 @@ YCPBuiltinList.cc YCPBuiltinBoolean.cc \ YCPBuiltinString.cc YCPBuiltinTerm.cc \ YCPBuiltinVoid.cc YCPBuiltinMap.cc \ - YCPBuiltinMisc.cc \ + YCPBuiltinMisc.cc YCPBuiltinSymbol.cc \ + YCPBuiltinMultiset.cc \ YSymbolEntry.cc \ TypeStatics.cc \ y2string.cc \ Modified: branches/tmp/lslezak/core/libycp/src/Scanner.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/S… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/Scanner.cc (original) +++ branches/tmp/lslezak/core/libycp/src/Scanner.cc Thu Jan 29 08:58:52 2009 @@ -23,6 +23,7 @@ #include <string> #include <unistd.h> #include <stdarg.h> +#include <errno.h> #include "ycp/Scanner.h" #include "ycp/y2log.h" @@ -216,7 +217,12 @@ else if (m_inputFd >= 0) { - ssize_t read_bytes = read (m_inputFd, buf, m_buffered ? maxnum : 1); + ssize_t read_bytes; + do { + read_bytes = read (m_inputFd, buf, m_buffered ? maxnum : 1); + } while (read_bytes == -1 && + (errno == EINTR || errno == ERESTART)); // bnc#434253 + if (read_bytes >= 0) return read_bytes; else Modified: branches/tmp/lslezak/core/libycp/src/Type.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/T… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/Type.cc (original) +++ branches/tmp/lslezak/core/libycp/src/Type.cc Thu Jan 29 08:58:52 2009 @@ -21,7 +21,7 @@ #include "ycp/Type.h" #include "ycp/Bytecode.h" #include "ycp/Xmlcode.h" -#include "ycp/YCPMap.h" // for YCPMapIterator +#include "ycp/YCPMap.h" #include "ycp/YCPCode.h" // for YT_Code in matchvalue() #ifndef DO_DEBUG @@ -455,10 +455,10 @@ // check every map element YCPMap mvalue = value->asMap(); - for (YCPMapIterator i = mvalue->begin(); i != mvalue->end(); i++) + for (YCPMap::const_iterator i = mvalue->begin(); i != mvalue->end(); ++i) { - YCPValue kvalue = i.key(); // get map key value - YCPValue evalue = i.value(); // get map element value + YCPValue kvalue = i->first; // get map key value + YCPValue evalue = i->second; // get map element value y2debug ("kvalue '%s', evalue '%s'", kvalue->toString().c_str(), evalue->toString().c_str()); if (key_type->matchvalue (kvalue) < 0) { Modified: branches/tmp/lslezak/core/libycp/src/YBlock.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YBlock.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YBlock.cc Thu Jan 29 08:58:52 2009 @@ -475,7 +475,7 @@ string -YBlock::toStringSwitch (map<YCPValue, int, ycpless> cases, int defaultcase) const +YBlock::toStringSwitch (map<YCPValue, int, ycp_less> cases, int defaultcase) const { // first, create reverse map of cases int statementcount = statementCount (); @@ -484,7 +484,7 @@ for (int i = 0; i < statementcount; i++) values[i] = YCPNull (); - for (map<YCPValue, int, ycpless>::iterator it = cases.begin (); + for (map<YCPValue, int, ycp_less>::iterator it = cases.begin (); it != cases.end (); it++ ) { values[ it->second ] = it->first; @@ -519,7 +519,7 @@ std::ostream & -YBlock::toXmlSwitch( map<YCPValue, int, ycpless> cases, int defaultcase, std::ostream & str, int indent ) const +YBlock::toXmlSwitch( map<YCPValue, int, ycp_less> cases, int defaultcase, std::ostream & str, int indent ) const { // first, create reverse map of cases int statementcount = statementCount (); @@ -528,7 +528,7 @@ for (int i = 0; i < statementcount; i++) values[i] = YCPNull (); - for (map<YCPValue, int, ycpless>::iterator it = cases.begin (); + for (map<YCPValue, int, ycp_less>::iterator it = cases.begin (); it != cases.end (); it++ ) { values[ it->second ] = it->first; Modified: branches/tmp/lslezak/core/libycp/src/YBuiltin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YBuiltin.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YBuiltin.cc Thu Jan 29 08:58:52 2009 @@ -50,6 +50,12 @@ #include "ycp/YCPBuiltinList.h" static YCPBuiltinList builtin_list; // trigger constructor +#include "ycp/YCPBuiltinMultiset.h" +static YCPBuiltinMultiset builtin_multiset; // trigger constructor + +#include "ycp/YCPBuiltinSymbol.h" +static YCPBuiltinSymbol builtin_symbol; // trigger constructor + #include "ycp/YCPBuiltinMap.h" static YCPBuiltinMap builtin_map; // trigger constructor Modified: branches/tmp/lslezak/core/libycp/src/YCPBuiltinFloat.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPBuiltinFloat.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPBuiltinFloat.cc Thu Jan 29 08:58:52 2009 @@ -313,8 +313,6 @@ { "-", "float (float)", (void *)f_neg }, { "*", "float (float, float)", (void *)f_mult }, { "/", "float (float, float)", (void *)f_div }, - { "trunc", "float (float)", (void *)f_trunc, DECL_DEPRECATED }, - { "pow", "float (float, float)", (void *)f_pow, DECL_DEPRECATED }, { "tofloat", "float (const any)", (void *)f_tofloat }, { "tostring","string (float, integer)", (void *)f_tostring }, { 0 } Modified: branches/tmp/lslezak/core/libycp/src/YCPBuiltinList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPBuiltinList.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPBuiltinList.cc Thu Jan 29 08:58:52 2009 @@ -72,10 +72,9 @@ SymbolEntryPtr s = symbol->asEntry()->entry(); - for (int i = 0; i < list->size (); i++) + for (YCPList::const_iterator it = list->begin(); it != list->end(); ++it) { - YCPValue element = list->value (i); - s->setValue (element); + s->setValue(*it); YCPValue v = expr->evaluate (); @@ -93,7 +92,7 @@ if (v->asBoolean ()->value ()) { - ret = element; + ret = *it; break; } } @@ -144,20 +143,7 @@ * @usage contains ([1, 2, 5], 2) -> true */ - if (list.isNull ()) - { - return YCPNull (); - } - - for (int i = 0; i < list->size (); i++) - { - if (list->value (i)->equal (value)) - { - return YCPBoolean (true); - } - } - - return YCPBoolean (false); + return YCPBoolean(list->contains(value)); } @@ -179,35 +165,7 @@ * @usage setcontains ([1, 2, 5], 2) -> true */ - if (list.isNull ()) - { - return YCPNull (); - } - - int hi = list->size () - 1; - int lo = 0; - - while (lo <= hi) - { - int mid = (hi + lo) / 2; - YCPValue midvalue = list->value (mid); - YCPOrder comp = value->compare (midvalue); - - switch (comp) - { - case YO_EQUAL: - return YCPBoolean (true); - break; - case YO_LESS: - hi = mid - 1; - break; - case YO_GREATER: - lo = mid + 1; - break; - } - } - - return YCPBoolean (false); + return YCPBoolean(binary_search(list->begin(), list->end(), value, ycp_less())); } @@ -254,18 +212,8 @@ // Already contained? I know, this has an _awful_ complexity. // We need to introduce an order on YCPValueRep to solve the problem. - bool contained = false; - for (int a = 0; a < newlist->size (); a++) - { - if (newlist->value (a)->equal (to_insert)) - { - contained = true; - break; - } - } - - if (!contained) + if (!newlist->contains(to_insert)) newlist->add (to_insert); } } @@ -440,10 +388,9 @@ SymbolEntryPtr s = symbol->asEntry()->entry(); - for (int i = 0; i < list->size (); i++) + for (YCPList::const_iterator it = list->begin(); it != list->end(); ++it) { - YCPValue element = list->value (i); - s->setValue (element); + s->setValue(*it); YCPValue v = expr->evaluate (); @@ -464,7 +411,7 @@ } if (v->asBoolean ()->value ()) { - ret->add (element); + ret->add(*it); } } @@ -501,9 +448,9 @@ YCPList ret; SymbolEntryPtr s = symbol->asEntry()->entry(); - for (int i = 0; i < list->size (); i++) + for (YCPList::const_iterator it = list->begin(); it != list->end(); ++it) { - s->setValue (list->value (i)); + s->setValue(*it); YCPValue v = expr->evaluate (); @@ -558,9 +505,9 @@ YCPList curr_list; YCPMap curr_map; - for (int i = 0; i < list->size (); i++) + for (YCPList::const_iterator it = list->begin(); it != list->end(); ++it) { - key->setValue (list->value (i)); + key->setValue(*it); YCPValue curr_value = expr->evaluate (); @@ -584,8 +531,8 @@ curr_map = curr_value->asMap(); if ( curr_map->size() == 1 ) { - YCPMapIterator it = curr_map->begin(); - ret->add (it.key(), it.value()); + YCPMap::const_iterator it = curr_map->begin(); + ret->add(it->first, it->second); } else { @@ -658,20 +605,10 @@ * @usage toset ([1, 5, 3, 2, 3, true, false, true]) -> [false, true, 1, 2, 3, 5] */ - if (list.isNull ()) - { - return YCPNull (); - } - - set <YCPValue, ycpless> newset; - - for (int i = 0; i < list->size (); i++) - { - newset.insert (list->value (i)); - } + set<YCPValue, ycp_less> newset(list->begin(), list->end()); YCPList setlist; - for (set <YCPValue, ycpless>::const_iterator it = newset.begin (); + for (set <YCPValue, ycp_less>::const_iterator it = newset.begin (); it != newset.end (); ++it) { setlist->add (*it); @@ -914,6 +851,27 @@ } +static YCPValue +l_isempty(const YCPList& l) +{ + /** + * @builtin isempty + * @id isempty-list + * @short Returns whether the list <tt>l</tt> is empty. + * @param list l List + * @return boolean Emptiness of list <tt>l</tt> + * + * @description + * Notice that the list <tt>l</tt> must not be nil. + * + * @usage isempty([]) -> true + * @usage isempty([19, 29]) -> false + */ + + return YCPBoolean(l->isEmpty()); +} + + // parameter is YCPValue because we accept 'nil' static YCPValue l_size (const YCPValue &list) @@ -949,11 +907,14 @@ * @short Removes element from a list * @param list LIST * @param integer e element index - * @return list Returns nil if the index is invalid. + * @return list Returns unchanged list if the index is invalid. * @description * Removes the <tt>i</tt>'th value from a list. The first value has the * index 0. The call remove ([1,2,3], 1) thus returns [1,3]. * + * The yast2-core version < 2.17.16 returns nil if the key is invalid. This behavior + * has changed in version 2.17.16 to return unchanged list. + * * @usage remove ([1, 2], 0) -> [2] */ @@ -975,7 +936,7 @@ if (idx < 0 || idx >= ret->size ()) { ycp2error ("Index %s for remove () out of range", toString (idx).c_str ()); - return YCPNull (); + return ret; } ret->remove (idx); @@ -1072,9 +1033,9 @@ SymbolEntryPtr s = sym->asEntry()->entry(); YCPValue ret = YCPVoid(); - for (int i=0; i < list->size(); i++) + for (YCPList::const_iterator it = list->begin(); it != list->end(); ++it) { - s->setValue (list->value (i)); + s->setValue(*it); ret = expr->evaluate (); if (ret.isNull()) @@ -1093,6 +1054,44 @@ static YCPValue +l_reduce_helper(const YCPSymbol &x, const YCPSymbol &y, const YCPValue &initial, + const YCPList::const_iterator &first, const YCPList::const_iterator &last, + const YCPCode &expr) +{ + SymbolEntryPtr xs = x->asEntry()->entry(); + SymbolEntryPtr ys = y->asEntry()->entry(); + + YCPValue ret = initial; + + for (YCPList::const_iterator it = first; it != last; ++it) + { + xs->setValue(ret); + ys->setValue(*it); + + YCPValue tmp = expr->evaluate(); + if (tmp.isNull()) + { + ycp2error("Bad 'reduce' expression %s", expr->toString().c_str()); + continue; + } + if (tmp->isVoid()) + { + ycp2error("The expression for 'reduce' returned 'nil'"); + continue; + } + if (tmp->isBreak()) + { + break; + } + + ret = tmp; + } + + return ret; +} + + +static YCPValue l_reduce1 (const YCPSymbol &x, const YCPSymbol &y, const YCPList &list, const YCPCode &expr) { /** @@ -1115,50 +1114,20 @@ * the list must not be empty. * * @usage list::reduce (integer x, integer y, [2, 4, 6], { return x < y ? x : y; }) -> 2 - * @usage list::reduce (integer x, integer y, [2, 4, 6], { return x < y ? x : y; }) -> 6 + * @usage list::reduce (integer x, integer y, [2, 4, 6], { return x > y ? x : y; }) -> 6 */ - if (list.isNull()) - { - return YCPNull(); - } - - if (list->size() < 1) + if (list->isEmpty()) { - ycp2error("Empty list %s for 'reduce'", list->toString().c_str()); + ycp2error("Empty list for 'reduce'"); return YCPNull(); } - SymbolEntryPtr xs = x->asEntry()->entry(); - SymbolEntryPtr ys = y->asEntry()->entry(); - - YCPValue ret = list->value(0); - - for (int i = 1; i < list->size(); i++) - { - xs->setValue(ret); - ys->setValue(list->value(i)); - - YCPValue tmp = expr->evaluate(); - if (tmp.isNull()) - { - ycp2error("Bad 'reduce' expression %s", expr->toString().c_str()); - continue; - } - if (tmp->isVoid()) - { - ycp2error("The expression for 'reduce' returned 'nil'"); - continue; - } - if (tmp->isBreak()) - { - break; - } + const YCPList::const_iterator initial = list->begin(); + const YCPList::const_iterator first = initial + 1; + const YCPList::const_iterator last = list->end(); - ret = tmp; - } - - return ret; + return l_reduce_helper(x, y, *initial, first, last, expr); } @@ -1175,7 +1144,7 @@ * @param list<flex2> list * @param block<flex1> expression * @return flex1 - * + * * @description * Apply expression cumulatively to the values of the list, from left to * right, to reduce the list to a single value. See @@ -1192,41 +1161,10 @@ * @usage list::reduce (term t, float f, `item(`id(`dummy)), [3.14, 2.71], { return add(t, tostring(f)); }) -> `item (`id (`dummy), "3.14", "2.71") */ - if (list.isNull()) - { - return YCPNull(); - } - - SymbolEntryPtr xs = x->asEntry()->entry(); - SymbolEntryPtr ys = y->asEntry()->entry(); - - YCPValue ret = initial; - - for (int i = 0; i < list->size(); i++) - { - xs->setValue(ret); - ys->setValue(list->value(i)); - - YCPValue tmp = expr->evaluate(); - if (tmp.isNull()) - { - ycp2error("Bad 'reduce' expression %s", expr->toString().c_str()); - continue; - } - if (tmp->isVoid()) - { - ycp2error("The expression for 'reduce' returned 'nil'"); - continue; - } - if (tmp->isBreak()) - { - break; - } - - ret = tmp; - } + const YCPList::const_iterator first = list->begin(); + const YCPList::const_iterator last = list->end(); - return ret; + return l_reduce_helper(x, y, initial, first, last, expr); } @@ -1264,7 +1202,7 @@ { "find", "flex (variable <flex>, const list <flex>, const block <boolean>)", (void *)l_find, DECL_SYMBOL|DECL_FLEX }, { "prepend", "list <flex> (const list <flex>, const flex)", (void *)l_prepend, DECL_FLEX }, { "contains", "boolean (const list <flex>, const flex)", (void *)l_contains, DECL_FLEX }, - { "setcontains","boolean (list <flex>, const flex)", (void *)l_setcontains, DECL_FLEX }, + { "setcontains","boolean (const list <flex>, const flex)", (void *)l_setcontains, DECL_FLEX }, { "union", "list <any> (const list <any>, const list <any>)", (void *)l_unionlist }, { "+", "list <flex> (const list <flex>, const list <flex>)", (void *)l_unionlist, DECL_FLEX }, { "merge", "list <any> (const list <any>, const list <any>)", (void *)l_mergelist }, @@ -1283,6 +1221,7 @@ { "add", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, { "+", "list <flex> (const list <flex>, const flex)", (void *)l_add, DECL_FLEX }, { "+", "list <any> (const list <any>, any)", (void *)l_add }, + { "isempty", "boolean (const list <any>)", (void *)l_isempty }, { "size", "integer (const list <any>)", (void *)l_size, DECL_NIL }, { "remove", "list <flex> (const list <flex>, const integer)", (void *)l_remove, DECL_FLEX }, { "select", "flex (const list <flex>, integer, flex)", (void *)l_select, DECL_NIL|DECL_FLEX }, Modified: branches/tmp/lslezak/core/libycp/src/YCPBuiltinMap.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPBuiltinMap.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPBuiltinMap.cc Thu Jan 29 08:58:52 2009 @@ -62,8 +62,7 @@ return YCPNull (); } - YCPValue tmp = map->value (value); - return YCPBoolean (!tmp.isNull ()); + return YCPBoolean(map->hasKey(value)); } @@ -96,10 +95,10 @@ SymbolEntryPtr k = key->asEntry()->entry(); SymbolEntryPtr v = value->asEntry()->entry(); - for (YCPMapIterator pos = map->begin (); pos != map->end (); ++pos) + for (YCPMap::const_iterator pos = map->begin(); pos != map->end(); ++pos) { - k->setValue (pos.key()); - v->setValue (pos.value()); + k->setValue (pos->first); + v->setValue (pos->second); YCPValue v = expr->evaluate (); @@ -120,7 +119,7 @@ } if (v->asBoolean ()->value ()) { - ret->add (pos.key (), pos.value ()); + ret->add(pos->first, pos->second); } } @@ -165,10 +164,10 @@ SymbolEntryPtr k = key->asEntry()->entry(); SymbolEntryPtr v = value->asEntry()->entry(); - for (YCPMapIterator pos = map->begin (); pos != map->end (); ++pos) + for (YCPMap::const_iterator pos = map->begin (); pos != map->end (); ++pos) { - k->setValue (pos.key()); - v->setValue (pos.value()); + k->setValue (pos->first); + v->setValue (pos->second); YCPValue curr_value = expr->evaluate (); @@ -180,8 +179,8 @@ } expr_map = curr_value->asMap(); - YCPMapIterator it = expr_map->begin(); - ret->add (it.key(), it.value()); + YCPMap::const_iterator it = expr_map->begin(); + ret->add(it->first, it->second); } else { @@ -227,10 +226,10 @@ SymbolEntryPtr k = key->asEntry()->entry(); SymbolEntryPtr v = value->asEntry()->entry(); - for (YCPMapIterator pos = map->begin (); pos != map->end (); pos++) + for (YCPMap::const_iterator pos = map->begin(); pos != map->end(); ++pos) { - k->setValue (pos.key()); - v->setValue (pos.value()); + k->setValue (pos->first); + v->setValue (pos->second); YCPValue v = expr->evaluate(); @@ -280,9 +279,9 @@ { YCPMap map = (m == 0 ? map1 : map2); - for (YCPMapIterator pos = map->begin (); pos != map->end (); pos++) + for (YCPMap::const_iterator pos = map->begin(); pos != map->end(); ++pos) { - newmap->add (pos.key (), pos.value ()); + newmap->add(pos->first, pos->second); } } @@ -361,6 +360,27 @@ } +static YCPValue +m_isempty(const YCPMap& m) +{ + /** + * @builtin isempty + * @id isempty-map + * @short Returns whether the map <tt>m</tt> is empty. + * @param map m Map + * @return boolean Emptiness of map <tt>m</tt> + * + * @description + * Notice that the map <tt>m</tt> must not be nil. + * + * @usage isempty($[]) -> true + * @usage isempty($[ `host : "pandora" ]) -> false + */ + + return YCPBoolean(m->isEmpty()); +} + + // parameter is YCPValue because we accept 'nil' static YCPValue m_size (const YCPValue &map) @@ -418,10 +438,10 @@ SymbolEntryPtr v = val->asEntry()->entry(); YCPValue ret = YCPVoid(); - for (YCPMapIterator pos = map->begin(); pos != map->end(); ++pos) + for (YCPMap::const_iterator pos = map->begin(); pos != map->end(); ++pos) { - k->setValue (pos.key()); - v->setValue (pos.value()); + k->setValue (pos->first); + v->setValue (pos->second); ret = expr->evaluate (); if (ret.isNull()) @@ -478,13 +498,16 @@ * * @description * Remove the value with the key <tt>KEY</tt> from a map. Returns - * nil if the key is invalid. + * unchanged map if the key is invalid. + * + * The yast2-core version < 2.17.16 returns nil if the key is invalid. This behavior + * has changed in version 2.17.16 to return unchanged map. * * @param map MAP * @param any KEY * @return map * - * @usage remove($[1:2], 0) -> nil + * @usage remove($[1:2], 0) -> $[1:2] * @usage remove($[1:2], 1) -> $[] * @usage remove ($[1:2, 3:4], 1) -> $[3:4] */ @@ -500,10 +523,10 @@ YCPMap ret = map; - if(map->value (key).isNull ()) + if (!map->hasKey(key)) { ycp2error ( "Key %s for remove () does not exist", key->toString ().c_str ()); - return YCPNull (); + return ret; } ret->remove (key); @@ -544,6 +567,7 @@ { "+", "map <any,any> (const map <any,any>, const map <any,any>)", (void *)m_unionmap }, { "add", "map <flex1,flex2> (const map <flex1,flex2>, const flex1, const flex2)", (void *)m_addmap, DECL_FLEX }, { "change", "map <flex1,flex2> (const map <flex1,flex2>, const flex1, const flex2)", (void *)m_changemap,DECL_FLEX|DECL_DEPRECATED }, + { "isempty", "boolean (const map <any,any>)", (void *)m_isempty }, { "size", "integer (const map <any,any>)", (void *)m_size, DECL_NIL }, { "foreach","flex1 (variable <flex2>, variable <flex3>, const map <flex2,flex3>, const block <flex1>)", (void *)m_foreach, DECL_LOOP|DECL_SYMBOL|DECL_FLEX }, { "tomap", "map <any,any> (const any)", (void *)m_tomap, DECL_FLEX }, Modified: branches/tmp/lslezak/core/libycp/src/YCPBuiltinMisc.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPBuiltinMisc.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPBuiltinMisc.cc Thu Jan 29 08:58:52 2009 @@ -35,6 +35,7 @@ #include "ycp/StaticDeclaration.h" #include "ycp/y2log.h" +#include "y2util/y2changes.h" #include "ycp/ExecutionEnvironment.h" extern StaticDeclaration static_declarations; @@ -614,6 +615,64 @@ } +static YCPValue +Y2UserItem (const YCPString & format, const YCPList & args) +{ + /** + * @builtin y2useritem + * @short Log an user-level system message to the y2changes + * + * @param string FORMAT + * @param any PAR1 + * @param any PAR2 + * @param any ... + * @return void + * @see sformat + * + * @usage y2useritem("Executing reboot") + */ + + YCPString arg = s_sformat (format, args); + if (arg.isNull () || !arg->isString ()) + { + return YCPNull (); + } + + y2useritem ("%s", arg->value().c_str()); + + return YCPVoid(); +} + + +static YCPValue +Y2UserNote (const YCPString & format, const YCPList & args) +{ + /** + * @builtin y2usernote + * @short Log an user-level addional message to the y2changes + * + * @param string FORMAT + * @param any PAR1 + * @param any PAR2 + * @param any ... + * @return void + * @see sformat + * + * @usage y2usernote("Starting module Bee") + */ + + YCPString arg = s_sformat (format, args); + if (arg.isNull () || !arg->isString ()) + { + return YCPNull (); + } + + y2usernote ("%s", arg->value().c_str()); + + return YCPVoid(); +} + + YCPBuiltinMisc::YCPBuiltinMisc () { // must be static, registerDeclarations saves a pointer to it! @@ -643,6 +702,9 @@ { "y2error", "void (integer, string, ...)", (void *)Y2FError, DECL_NIL|DECL_WILD }, { "y2security", "void (integer, string, ...)", (void *)Y2FSecurity, DECL_NIL|DECL_WILD }, { "y2internal", "void (integer, string, ...)", (void *)Y2FInternal, DECL_NIL|DECL_WILD }, + // user-level logging + { "y2useritem", "void (string, ...)", (void *)Y2UserItem, DECL_NIL|DECL_WILD|DECL_FORMATTED }, + { "y2usernote", "void (string, ...)", (void *)Y2UserNote, DECL_NIL|DECL_WILD|DECL_FORMATTED }, { 0 } }; Modified: branches/tmp/lslezak/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPBuiltinString.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPBuiltinString.cc Thu Jan 29 08:58:52 2009 @@ -35,7 +35,6 @@ #include <stdio.h> #include <regex.h> #include <libintl.h> -#include <iostream> #include <string> using std::string; @@ -58,6 +57,27 @@ static YCPValue +s_isempty(const YCPString& s) +{ + /** + * @builtin isempty + * @id isempty-string + * @short Returns whether the string <tt>s</tt> is empty. + * @param string s String + * @return boolean Emptiness of string <tt>s</tt> + * + * @description + * Notice that the string <tt>s</tt> must not be nil. + * + * @usage isempty("") -> true + * @usage isempty("test") -> false + */ + + return YCPBoolean(s->isEmpty()); +} + + +static YCPValue s_size (const YCPString &s) { /** @@ -331,6 +351,114 @@ static YCPValue +s_lsubstring1 (const YCPString &s, const YCPInteger &i1) +{ + /** + * @builtin lsubstring + * @id lsubstring-rest + * @short Extracts a substring in UTF-8 encoded string + * + * @description + * Extracts a substring of the string <tt>STRING</tt>, starting at + * <tt>OFFSET</tt> after the first one with length of at most + * <tt>LENGTH</tt>. <tt>OFFSET</tt> starts with 0. This method uses UTF-8 encoding. + * + * @param string STRING + * @param integer OFFSET + * @param integer LENGTH + * @return string + * @usage substring ("some text", 5) -> "text" + * @usage substring ("some text", 42) -> "" + */ + + if (s.isNull () || i1.isNull()) + return YCPNull (); + + string lss = s->value (); + wstring ss; + + if( ! utf82wchar( lss, &ss ) ) + { + y2error( "Unable to recode string '%s' to UTF-8", lss.c_str() ); + return YCPNull (); + } + + string::size_type start = i1->value (); + + if (start > ss.size ()) + { + ycp2error ("Substring index out of range"); + return YCPString (""); + } + + ss = ss.substr ((wstring::size_type) start, wstring::npos); + + if( !wchar2utf8( ss, &lss ) ) + { + y2error( "Unable to recode result string '%ls' from UTF-8", ss.c_str() ); + return YCPNull (); + } + + return YCPString(lss); +} + + +static YCPValue +s_lsubstring2 (const YCPString &s, const YCPInteger &i1, const YCPInteger &i2) +{ + /** + * @builtin lsubstring + * @id lsubstring-length + * @short Extracts a substring in UTF-8 encoded string + * + * @description + * Extracts a substring of the string <tt>STRING</tt>, starting at + * <tt>OFFSET</tt> after the first one with length of at most + * <tt>LENGTH</tt>. <tt>OFFSET</tt> starts with 0. This method uses UTF-8 encoding. + * + * @param string STRING + * @param integer OFFSET + * @param integer LENGTH + * @return string + * @usage lsubstring ("some text", 5, 2) -> "te" + * @usage lsubstring ("some text", 42, 2) -> "" + * @usage lsubstring("123456789", 2, 3) -> "345" + */ + + if (s.isNull () || i1.isNull() || i2.isNull ()) + return YCPNull (); + + string lss = s->value (); + wstring ss; + + if( ! utf82wchar( lss, &ss ) ) + { + y2error( "Unable to recode string '%s' to UTF-8", lss.c_str() ); + return YCPNull (); + } + + string::size_type start = i1->value (); + string::size_type length = i2->value (); + + if (start > ss.size ()) + { + ycp2error ("Substring index out of range"); + return YCPString (""); + } + + ss = ss.substr (start, length); + + if( !wchar2utf8( ss, &lss ) ) + { + y2error( "Unable to recode result string '%ls' from UTF-8", ss.c_str() ); + return YCPNull (); + } + + return YCPString(lss); +} + + +static YCPValue s_search (const YCPString &s1, const YCPString &s2) { /** @@ -1380,6 +1508,7 @@ { "tostring", "string (any)", (void *)s_tostring }, { "tohexstring", "string (integer)", (void *)s_tohexstring1 }, { "tohexstring", "string (integer, integer)", (void *)s_tohexstring2 }, + { "isempty", "boolean (string)", (void *)s_isempty }, { "size", "integer (string)", (void *)s_size }, { "find", "integer (string, string)", (void *)s_find, DECL_DEPRECATED }, { "search", "integer (string, string)", (void *)s_search }, @@ -1407,6 +1536,8 @@ { "dgettext", "string (string, string)", (void *)s_dgettext}, { "dngettext", "string (string, string, string, integer)", (void *)s_dngettext}, { "dpgettext", "string (string, string, string)", (void *)s_dpgettext}, + { "lsubstring", "string (string, integer)", (void *)s_lsubstring1 }, + { "lsubstring", "string (string, integer, integer)", (void *)s_lsubstring2 }, { 0 } }; Modified: branches/tmp/lslezak/core/libycp/src/YCPBuiltinTerm.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPBuiltinTerm.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPBuiltinTerm.cc Thu Jan 29 08:58:52 2009 @@ -232,6 +232,9 @@ * remove which allowed 'remove(`term(1,2,3), 0) = [1,2,3]' * Use 'argsof (term) -> list' for this kind of transformation.) * + * The yast2-core version < 2.17.16 returns nil if the index is invalid. This behavior + * has changed in version 2.17.16 to return unchanged term. + * * @param term TERM * @param integer i * @return term @@ -250,7 +253,7 @@ if (idx <= 0 || idx > args->size ()) { ycp2error ("Index %s for remove () out of range", toString (idx).c_str ()); - return YCPNull (); + return term; } args->remove (idx-1); Modified: branches/tmp/lslezak/core/libycp/src/YCPList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPList.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPList.cc Thu Jan 29 08:58:52 2009 @@ -10,10 +10,11 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YCPList.cc + File: YCPList.cc Authors: Mathias Kettner <kettner(a)suse.de> Klaus Kaempf <kkaempf(a)suse.de> + Arvin Schnell <aschnell(a)suse.de> Maintainer: Klaus Kaempf <kkaempf(a)suse.de> /-*/ @@ -67,6 +68,13 @@ void +YCPListRep::push_back(const YCPValue& value) +{ + elements.push_back(value); +} + + +void YCPListRep::set (const int i, const YCPValue& value) { if (i < 0) @@ -102,41 +110,24 @@ bool YCPListRep::contains (const YCPValue& value) const { - for (vector <YCPValue>::const_iterator it = elements.begin (); - it != elements.end (); it++) - { - if ((*it)->equal (value)) - return true; - } - - return false; -} - - -static bool compareYCP (const YCPValue& y1, const YCPValue& y2) -{ - return (y1->compare(y2)) == YO_LESS; + return find_if(begin(), end(), bind2nd(ycp_equal_to(), value)) != end(); } void YCPListRep::sortlist() { - std::sort (elements.begin (), elements.end (), compareYCP); + std::sort(elements.begin(), elements.end(), ycp_less()); } -static bool lcompareYCP( const YCPValue& y1, const YCPValue& y2 ) +void +YCPListRep::lsortlist() { - return y1->compare(y2, true) == YO_LESS; + std::sort(elements.begin(), elements.end(), ycp_less(true)); } -void YCPListRep::lsortlist() -{ - std::sort (elements.begin (), elements.end (), lcompareYCP); -} - void YCPListRep::fsortlist(const YCPCodeCompare& cmp) { @@ -193,6 +184,20 @@ } +YCPListRep::const_iterator +YCPListRep::begin() const +{ + return elements.begin(); +} + + +YCPListRep::const_iterator +YCPListRep::end() const +{ + return elements.end(); +} + + YCPOrder YCPListRep::compare(const YCPList& l) const { Modified: branches/tmp/lslezak/core/libycp/src/YCPMap.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPMap.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPMap.cc Thu Jan 29 08:58:52 2009 @@ -12,7 +12,8 @@ File: YCPMap.cc - Author: Mathias Kettner <kettner(a)suse.de> + Authors: Mathias Kettner <kettner(a)suse.de> + Arvin Schnell <aschnell(a)suse.de> Maintainer: Klaus Kaempf <kkaempf(a)suse.de> /-*/ @@ -56,12 +57,22 @@ ycp2error ("Only integer, string, or symbol constant allowed as key in map"); return; } - YCPValueYCPValueMap::iterator pos = stl_map.find( key ); - if ( pos == stl_map.end() ) - stl_map.insert( YCPValueYCPValueMap::value_type( key, value ) ); - else + // Note: 'stl_map[key] = value' would create a temporary object using the + // default constructor for YCPValue. See Scott Meyers, Effective STL, Item + // 24. + + YCPMap::iterator pos = stl_map.lower_bound(key); + if (pos != stl_map.end() && !YCPMap::key_compare()(key, pos->first)) + { pos->second = value; + } + else + { + // pos is just a hint but can avoid a second search through the map + stl_map.insert(pos, YCPMap::value_type(key, value)); + } + } @@ -79,9 +90,9 @@ YCPMap newmap; - for (YCPMapIterator pos = begin(); pos != end(); ++pos ) + for (YCPMap::const_iterator pos = begin(); pos != end(); ++pos) { - newmap->add( pos.key(), pos.value() ); + newmap->add(pos->first, pos->second); } newmap->add( key, value ); @@ -106,13 +117,20 @@ { YCPMapRep* newmap = new YCPMapRep (); - for (YCPMapIterator pos = begin(); pos != end(); ++pos ) - newmap->add (pos.key(), pos.value()); + for (YCPMap::const_iterator pos = begin(); pos != end(); ++pos) + newmap->add(pos->first, pos->second); return newmap; } +bool +YCPMapRep::isEmpty() const +{ + return stl_map.empty(); +} + + long YCPMapRep::size() const { @@ -120,13 +138,22 @@ } +bool +YCPMapRep::hasKey(const YCPValue& key) const +{ + return stl_map.find(key) != stl_map.end(); +} + + YCPValue YCPMapRep::value(const YCPValue& key) const { - YCPMapIterator pos = stl_map.find( key ); + YCPMap::const_iterator pos = stl_map.find(key); - if ( pos != end() ) return pos.value(); - else return YCPNull(); + if (pos != end()) + return pos->second; + else + return YCPNull(); } @@ -151,16 +178,16 @@ else { // equal length ==> pairwise comparison - for( YCPMapIterator pos_this = begin(), pos_m = m->begin(); + for( YCPMap::const_iterator pos_this = begin(), pos_m = m->begin(); pos_this != end(), pos_m != m->end(); ++pos_this, ++pos_m ) { // compare keys - order = pos_this.key()->compare( pos_m.key() ); + order = pos_this->first->compare(pos_m->first); if ( order == YO_LESS || order == YO_GREATER ) return order; // equal keys ==> compare values - order = pos_this.value()->compare( pos_m.value() ); + order = pos_this->second->compare(pos_m->second); if ( order == YO_LESS || order == YO_GREATER ) return order; } @@ -177,25 +204,18 @@ { string s = "$["; - for(YCPMapIterator pos = begin(); pos != end(); ++pos ) + for (YCPMap::const_iterator pos = begin(); pos != end(); ++pos) { if ( pos != begin() ) s += ", "; - s += pos.key()->toString() + s += pos->first->toString() + ":" - + ((pos.value().isNull()) ? "(null)" : pos.value()->toString()); + + ((pos->second.isNull()) ? "(null)" : pos->second->toString()); } return s + "]"; } -YCPMapIterator -YCPMapRep::findKey(const YCPValue& key) const -{ - return stl_map.find( key ); -} - - YCPValueType YCPMapRep::valuetype() const { @@ -210,11 +230,11 @@ YCPMapRep::toStream (std::ostream & str) const { Bytecode::writeInt32 (str, stl_map.size()); - for(YCPMapIterator pos = begin(); pos != end(); ++pos ) + for (YCPMap::const_iterator pos = begin(); pos != end(); ++pos) { - if (!Bytecode::writeValue (str, pos.key())) + if (!Bytecode::writeValue (str, pos->first)) break; - if (!Bytecode::writeValue (str, pos.value())) + if (!Bytecode::writeValue (str, pos->second)) break; } return str; @@ -225,11 +245,11 @@ YCPMapRep::toXml (std::ostream & str, int indent ) const { str << "<map size=\"" << stl_map.size() << "\">"; - for(YCPMapIterator pos = begin(); pos != end(); ++pos ) + for (YCPMap::const_iterator pos = begin(); pos != end(); ++pos) { str << "<element>"; - str << "<key>"; pos.key()->toXml( str, 0 ); str << "</key>"; - str << "<value>"; pos.value()->toXml( str, 0 ); str << "</value>"; + str << "<key>"; pos->first->toXml( str, 0 ); str << "</key>"; + str << "<value>"; pos->second->toXml( str, 0 ); str << "</value>"; str << "</element>"; } return str << "</map>"; Modified: branches/tmp/lslezak/core/libycp/src/YCPString.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YCPString.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YCPString.cc Thu Jan 29 08:58:52 2009 @@ -33,6 +33,14 @@ { } + +bool +YCPStringRep::isEmpty() const +{ + return v.empty(); +} + + string YCPStringRep::value() const { Modified: branches/tmp/lslezak/core/libycp/src/YExpression.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YExpression.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YExpression.cc Thu Jan 29 08:58:52 2009 @@ -1116,13 +1116,13 @@ YCPMap map = value->asMap (); - for (YCPMapIterator pos = map->begin (); pos != map->end (); pos++) + for (YCPMap::const_iterator pos = map->begin(); pos != map->end(); ++pos) { - if (! canPropagate (pos.key (), key) ) + if (! canPropagate (pos->first, key) ) { return false; } - if (! canPropagate (pos.value (), elem) ) + if (! canPropagate (pos->second, elem) ) { return false; } Modified: branches/tmp/lslezak/core/libycp/src/YStatement.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/Y… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/YStatement.cc (original) +++ branches/tmp/lslezak/core/libycp/src/YStatement.cc Thu Jan 29 08:58:52 2009 @@ -1927,7 +1927,7 @@ Bytecode::writeInt32 (str, m_cases.size ()); - for (map<YCPValue, int, ycpless>::const_iterator it = m_cases.begin () + for (map<YCPValue, int, ycp_less>::const_iterator it = m_cases.begin () ; it != m_cases.end () ; it++) { Bytecode::writeValue (str, it->first); Modified: branches/tmp/lslezak/core/libycp/src/include/YCP.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/YCP.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/YCP.h Thu Jan 29 08:58:52 2009 @@ -28,6 +28,37 @@ // include all basic types +/** + * \page libycp libycp Library + * + * This is a library implementing basic \ref ycpvalues and \ref ycplanguage. + */ + +/** + * \page ycpvalues YCP Values + * + * YCP values are the primary way of communicating of YaST components. The following values are implemented: + * + * <em>Simple values:</em> + * + * - \ref YCPNull no value - typically error during internal communication + * - \ref YCPVoid nil value + * - \ref YCPBoolean boolean value + * - \ref YCPInteger signed 64-bit integer + * - \ref YCPFloat double floating point + * - \ref YCPString UTF-8 encoded string + * + * <em>Special values:</em> + * - \ref YCPByteblock array of bytes (e.g. image) + * - \ref YCPCode executable code written in YCP language + * - \ref YCPExternal pointer + * + * <em>Complex values:</em> + * - \ref YCPList list/array of YCP values + * - \ref YCPMap map/hash of YCP values, key/value pairs + * - \ref YCPPath special ordered list of YCP values + * - \ref YCPTerm constant structure of YCP values + */ #include <ycp/YCPBoolean.h> #include <ycp/YCPByteblock.h> #include <ycp/YCPCode.h> Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/Makefile.am (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/Makefile.am Thu Jan 29 08:58:52 2009 @@ -19,11 +19,12 @@ YCPDebugger.h \ Type.h TypePtr.h \ YCPBuiltinBoolean.h YCPBuiltinFloat.h \ - YCPBuiltinByteblock.h \ + YCPBuiltinByteblock.h YCPBuiltinSymbol.h \ YCPBuiltinInteger.h YCPBuiltinList.h \ YCPBuiltinMap.h YCPBuiltinMisc.h \ YCPBuiltinPath.h YCPBuiltinString.h \ YCPBuiltinTerm.h YCPBuiltinVoid.h \ + YCPBuiltinMultiset.h \ StaticDeclaration.h \ YCode.h YCodePtr.h \ YCPCode.h \ Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/Parser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/Parser.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/Parser.h Thu Jan 29 08:58:52 2009 @@ -36,7 +36,8 @@ class YBlock; /** - * @short YCP parser + * @short YCP language parser + * * A YCP parser read a characters stream and outputs a sequence * of YCP values. Three properties of the YCP grammar are important: * Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YBlock.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YBlock.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YBlock.h Thu Jan 29 08:58:52 2009 @@ -274,7 +274,7 @@ string toString () const; string environmentToString () const; - string toStringSwitch (map<YCPValue, int, ycpless> cases, int defaultcase) const; + string toStringSwitch (map<YCPValue, int, ycp_less> cases, int defaultcase) const; //--------------------------------------------------------------- // stream output @@ -282,7 +282,7 @@ // write block to stream std::ostream & toStream (std::ostream & str) const; std::ostream & toXml( std::ostream & str, int indent ) const; - std::ostream & toXmlSwitch( map<YCPValue, int, ycpless> cases, int defaultcase, std::ostream & str, int indent ) const; + std::ostream & toXmlSwitch( map<YCPValue, int, ycp_less> cases, int defaultcase, std::ostream & str, int indent ) const; }; Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YCPCodeCompare.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YCPCodeCompare.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YCPCodeCompare.h Thu Jan 29 08:58:52 2009 @@ -20,6 +20,7 @@ #include "y2/SymbolEntry.h" #include "ycp/YCPCode.h" +#include "ycp/YCPBoolean.h" #include "ycp/y2log.h" /** Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YCPList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YCPList.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YCPList.h Thu Jan 29 08:58:52 2009 @@ -10,10 +10,11 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YCPList.h + File: YCPList.h - Author: Mathias Kettner <kettner(a)suse.de> - Maintainer: Thomas Roelz <tom(a)suse.de> + Authors: Mathias Kettner <kettner(a)suse.de> + Arvin Schnell <aschnell(a)suse.de> + Maintainer: Thomas Roelz <tom(a)suse.de> /-*/ // -*- c++ -*- @@ -25,9 +26,9 @@ #include "YCPValue.h" - class YCPCodeCompare; + /** * @short List of YCPValues that is a value itself * In YCP there is no distinction between lists, tuples and structs. @@ -42,9 +43,19 @@ */ class YCPListRep : public YCPValueRep { - vector<YCPValue> elements; +private: + + typedef vector<YCPValue> YCPValueList; + + YCPValueList elements; protected: + + typedef YCPValueList::iterator iterator; + typedef YCPValueList::const_iterator const_iterator; + typedef YCPValueList::value_type value_type; + typedef YCPValueList::const_reference const_reference; + friend class YCPList; /** @@ -58,6 +69,7 @@ ~YCPListRep() {} public: + /** * Returns the number of elements in the list. */ @@ -81,6 +93,13 @@ void add(const YCPValue& value); /** + * Appends a value to the list. Takes over the memory management + * of that value. Use @ref YCPElementRep, if you need it + * yourself. + */ + void push_back(const YCPValue& value); + + /** * Sets a value in the list. Takes over the memory management * of that value. Use @ref YCPElementRep, if you need it * yourself. @@ -141,6 +160,18 @@ YCPValue value(int n) const; /** + * Returns a random access iterator for the YCPList that + * is positioned at the first value in the list. + */ + const_iterator begin() const; + + /** + * Returns a random access iterator for the YCPList that + * is positioned behind the last value in the list. + */ + const_iterator end() const; + + /** * Compares two YCPLists for equality, greaterness or smallerness. * The relation is lexicographically with respect to the list elements, * i.e. elementwise comparison up to the shorter length. @@ -186,6 +217,7 @@ string commaList() const; }; + #define CONST_ELEMENT (static_cast<const YCPListRep*>(element)) #define ELEMENT (const_cast<YCPListRep*>(static_cast<const YCPListRep*>(this->writeCopy()))) @@ -198,7 +230,14 @@ class YCPList : public YCPValue { DEF_COW_COMMON(List, Value); + public: + + typedef YCPListRep::iterator iterator; + typedef YCPListRep::const_iterator const_iterator; + typedef YCPListRep::value_type value_type; + typedef YCPListRep::const_reference const_reference; + YCPList() : YCPValue(new YCPListRep()) {} YCPList(bytecodeistream & str); @@ -206,6 +245,7 @@ void reserve (int size) { ELEMENT->reserve (size); } bool isEmpty() const { return CONST_ELEMENT->isEmpty (); } void add(const YCPValue& value) { ELEMENT->add (value); } + void push_back(const YCPValue& value) { ELEMENT->push_back(value); } void set(const int n, const YCPValue& value) { ELEMENT->set (n, value); } void remove(const int n) { ELEMENT->remove (n); } void swap(int x, int y) { ELEMENT->swap (x, y); } @@ -217,6 +257,8 @@ YCPList functionalAdd(const YCPValue& value, bool prepend = false) const { return CONST_ELEMENT->functionalAdd (value, prepend); } YCPValue value(int n) const { return CONST_ELEMENT->value (n); } + const_iterator begin() const { return CONST_ELEMENT->begin(); } + const_iterator end() const { return CONST_ELEMENT->end(); } string commaList() const { return CONST_ELEMENT->commaList (); } }; Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YCPMap.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YCPMap.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YCPMap.h Thu Jan 29 08:58:52 2009 @@ -10,10 +10,11 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YCPMap.h + File: YCPMap.h - Author: Mathias Kettner <kettner(a)suse.de> - Maintainer: Thomas Roelz <tom(a)suse.de> + Authors: Mathias Kettner <kettner(a)suse.de> + Arvin Schnell <aschnell(a)suse.de> + Maintainer: Thomas Roelz <tom(a)suse.de> /-*/ // -*- c++ -*- @@ -26,9 +27,12 @@ #include "ycpless.h" -typedef map<YCPValue, YCPValue, ycpless> YCPValueYCPValueMap; +// Only for backwards compatibility. See mail from aschnell on yast-devel on +// 2009-01-07. http://lists.opensuse.org/yast-devel/2009-01/msg00016.html +typedef map<YCPValue, YCPValue, ycp_less> YCPValueYCPValueMap; class YCPMapIterator; + /** * @short A mapping from keys to values. * A map is also called assiciative array. It is a mapping from a set @@ -40,9 +44,18 @@ */ class YCPMapRep : public YCPValueRep { +private: + YCPValueYCPValueMap stl_map; protected: + + typedef YCPValueYCPValueMap::iterator iterator; + typedef YCPValueYCPValueMap::const_iterator const_iterator; + typedef YCPValueYCPValueMap::value_type value_type; + typedef YCPValueYCPValueMap::const_reference const_reference; + typedef YCPValueYCPValueMap::key_compare key_compare; + friend class YCPMap; /** @@ -56,6 +69,7 @@ ~YCPMapRep() {} public: + /** * Adds a new key/value pair. If the key is * existent, the old entry will be overwritten @@ -82,27 +96,35 @@ void remove(const YCPValue& key); /** + * Returns true, iff this map is empty. + */ + bool isEmpty() const; + + /** * Returns the number of key/value pairs. */ long size() const; /** + * Returns true iff the map contains the key. + */ + bool hasKey(const YCPValue& key) const; + + /** * Looks for a certain key and returns the value assigned * to that key. Returns 0, if the key is not found. */ YCPValue value(const YCPValue& key) const; /** - * Returns a bidirectional STL iterator for the YCPMap that + * Returns a bidirectional iterator for the YCPMap that * is positioned at the first value pair in the map. - * (suitable for iterating over all entries) */ YCPMapIterator begin() const; /** - * Returns a bidirectional STL iterator for the YCPMap that - * is positioned BEHIND the last value pair in the map. - * (suitable for iterating over all entries) + * Returns a bidirectional iterator for the YCPMap that + * is positioned behind the last value pair in the map. */ YCPMapIterator end() const; @@ -135,61 +157,18 @@ * Returns YT_MAP. See @ref YCPValueRep#valuetype. */ YCPValueType valuetype() const; - - -private: - /** - * Searches the map for a given key and returns - * an iterator that is positioned at the entry found. - * If the key can not be found the iterator is positioned - * at end(). - */ - YCPMapIterator findKey(const YCPValue& key) const; }; -/** - * @short Iterator for YCPMap values. - */ -class YCPMapIterator -{ - friend class YCPMapRep; - - YCPValueYCPValueMap::const_iterator position; -protected: - YCPMapIterator(YCPValueYCPValueMap::const_iterator position) - : position(position) {} - -public: - /** - * Return the key of the current position. - */ - YCPValue key() const { return position->first; } - - /** - * Return the value of the current position. - */ - YCPValue value() const { return position->second; } - - /** - * Check for equality. - */ - friend bool operator==(const YCPMapIterator &x, const YCPMapIterator &y) { - return x.position == y.position; - } - - /** - * Check for inequality. - */ - friend bool operator!=(const YCPMapIterator &x, const YCPMapIterator &y) { - return !(x == y); - } +// Only for backwards compatibility. See mail from aschnell on yast-devel on +// 2009-01-07. http://lists.opensuse.org/yast-devel/2009-01/msg00016.html +struct YCPMapIterator : public YCPValueYCPValueMap::const_iterator +{ + YCPMapIterator(YCPValueYCPValueMap::const_iterator it) + : YCPValueYCPValueMap::const_iterator(it) {} - /** - * Advance to the next position. - */ - void operator++() { ++position; } - void operator++(int) { ++position; } + YCPValue key() const __attribute__ ((deprecated)) { return (*this)->first; } + YCPValue value() const __attribute__ ((deprecated)) { return (*this)->second; } }; @@ -205,14 +184,24 @@ class YCPMap : public YCPValue { DEF_COW_COMMON(Map, Value); + public: + + typedef YCPMapRep::iterator iterator; + typedef YCPMapRep::const_iterator const_iterator; + typedef YCPMapRep::value_type value_type; + typedef YCPMapRep::const_reference const_reference; + typedef YCPMapRep::key_compare key_compare; + YCPMap() : YCPValue(new YCPMapRep()) {} YCPMap(bytecodeistream & str); void add(const YCPValue& key, const YCPValue& value) { ELEMENT->add (key,value); } YCPMap functionalAdd(const YCPValue& key, const YCPValue& value) const { return CONST_ELEMENT-> functionalAdd (key,value); } void remove(const YCPValue& key) { ELEMENT-> remove (key); } + bool isEmpty() const { return CONST_ELEMENT->isEmpty(); } long size() const { return CONST_ELEMENT-> size (); } + bool hasKey(const YCPValue& key) const { return CONST_ELEMENT->hasKey(key); } YCPValue value(const YCPValue& key) const { return CONST_ELEMENT-> value (key); } YCPMapIterator begin() const { return CONST_ELEMENT-> begin (); } YCPMapIterator end() const { return CONST_ELEMENT-> end (); } Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YCPString.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YCPString.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YCPString.h Thu Jan 29 08:58:52 2009 @@ -53,6 +53,12 @@ YCPStringRep(string s); public: + + /** + * Returns true, iff this string is empty. + */ + bool isEmpty() const; + /** * Returns the value of this object in form of a C++ * string value. @@ -94,6 +100,9 @@ YCPValueType valuetype() const; }; + +#define CONST_ELEMENT (static_cast<const YCPStringRep*>(element)) + /** * @short Wrapper for YCPStringRep * This class realizes an automatic memory management @@ -106,7 +115,11 @@ public: YCPString(string s) : YCPValue(new YCPStringRep(s)) {} YCPString(bytecodeistream & str); + + bool isEmpty() const { return CONST_ELEMENT->isEmpty(); } }; +#undef CONST_ELEMENT + #endif // YCPString_h Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YCode.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YCode.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YCode.h Thu Jan 29 08:58:52 2009 @@ -21,6 +21,21 @@ #ifndef YCode_h #define YCode_h +/** + * \page ycplanguage YCP Scripting Language + * \todo Enhance + * + * YCP is a very simple imperative scripting language with builtin support for + * \ref ycpvalues, easy access to \ref components, common control structures and more. + * It is designed to be well suited for system configuration manipulation. + * + * YCP interpreter consists of the following parts: + * - YCP \ref Parser which parses ASCII representation into in-memory representation (C++ classes + * inheriting from the \ref YCode class. + * - YCP interpreter - the \ref YCode based classes + * - \ref YCP bytecode implementation + */ + #include <string> using std::string; @@ -48,7 +63,14 @@ typedef struct ycodelist ycodelist_t; /** - * @short YCode for precompiled ycp code + * \brief YCode for precompiled ycp code + * + * A class representing parsed YCP code. This is an abstract base class for implementing + * any YCP language feature. \ref kind uniquely identifies the type of the class. + * The class provides infrastructure for dumping a bytecode representation (\ref toStream), + * XML representation (\ref toXML) and ASCII representation (\ref toString). + * + * The represented YCP code is executed via invoking \ref evaluate. */ class YCode : public Rep #ifdef D_MEMUSAGE @@ -132,73 +154,107 @@ YCode (); /** - * Cleans up + * Destructor */ virtual ~YCode(); /** - * Returns the YCode kind + * Kind of this \ref YCode. This method must be reimplemented in the inherited classes. + * + * \return the YCode kind */ virtual ykind kind() const = 0; /** - * Returns an ASCII representation of the YCode. + * Return ASCII represtation of this YCP code. + * + * \return ASCII string representation */ virtual string toString() const; + + /** + * String representation of the YCode kind value. For debugging purposes. + * + * \param kind which kind representation should be returned + * \return string representation + */ static string toString(ykind kind); /** - * writes YCode to a stream - * see Bytecode for read + * Write YCP code to a byte stream (bytecode implementation). Every + * class inheriting from \ref YCode must reimplement this method. + * \param str byte stream to store into + * \return byte stream for chaining writing bytecode (str) */ virtual std::ostream & toStream (std::ostream & str) const = 0; + + /** + * Write YCP code as XML representation. Every class inheriting from + * \ref YCode must reimplement this method. + * \param str string stream to store into + * \param indend indentation level for pretty print + * \return string stream for chaining writing XML (str) + */ virtual std::ostream & toXml (std::ostream & str, int indent ) const = 0; /** - * returns true if the YCode represents a constant + * Is this code constant? + * + * \return true if the \ref YCode represents a constant */ virtual bool isConstant () const; /** - * returns true if the YCode represents an error + * Is this code a representation of an error? + * + * \returns true if the \ref YCode represents an error */ bool isError () const; /** - * returns true if the YCode represents a statement + * Is this a YCP statement (e.g. if, while, ...) + * + * \return true if the \ref YCode represents a statement */ virtual bool isStatement () const; /** - * returns true if the YCode represents a block + * Is this a YCP block? + * + * \return true if the \ref YCode represents a block */ virtual bool isBlock () const; /** - * returns true if the YCode represents something we can reference to + * Can this code be stored in a variable of a type reference? + * + * \return true if the \ref YCode represents something we can reference to */ virtual bool isReferenceable () const; /** - * evaluate YCode to YCPValue - * if debugger == 0 - * called for parse time evaluation (i.e. constant subexpression elimination) - * else - * called for runtime evaluation + * Execute YCP code to get the resulting \ref YCPValue. Every inherited class of YCode should reimplement + * this method. + * + * \return \ref YCPValue after executing the code + * \param cse should the evaluation be done for parse time evaluation (i.e. constant subexpression elimination) */ virtual YCPValue evaluate (bool cse = false); /** - * return type (interesting mostly for function calls) + * Return type of this YCP code (interesting mostly for function calls). + * + * \return type of the value to be returned after calling \ref evaluate */ virtual constTypePtr type() const; }; /** - * constant (-> YCPValue) + * \brief YCP Constant + * + * The base class for YCP constants (\ref YCPValue). */ - class YConst : public YCode { REP_BODY(YConst); Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/YStatement.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/YStatement.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/YStatement.h Thu Jan 29 08:58:52 2009 @@ -516,7 +516,7 @@ int m_defaultcase; // indices of the case statements in the block - map<YCPValue, int, ycpless> m_cases; + map<YCPValue, int, ycp_less> m_cases; public: YSSwitch (YCodePtr condition); Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/pathsearch.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/pathsearch.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/pathsearch.h Thu Jan 29 08:58:52 2009 @@ -97,8 +97,10 @@ */ static string completeFilename (const string& fname); -private: +protected: + static bool searchPrefixWarn; +private: static int defaultComponentLevel (); }; Modified: branches/tmp/lslezak/core/libycp/src/include/ycp/ycpless.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/i… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/include/ycp/ycpless.h (original) +++ branches/tmp/lslezak/core/libycp/src/include/ycp/ycpless.h Thu Jan 29 08:58:52 2009 @@ -10,10 +10,11 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: ycpless.h + File: ycpless.h - Author: Mathias Kettner <kettner(a)suse.de> - Maintainer: Thomas Roelz <tom(a)suse.de> + Authors: Mathias Kettner <kettner(a)suse.de> + Arvin Schnell <aschnell(a)suse.de> + Maintainer: Thomas Roelz <tom(a)suse.de> /-*/ // -*- c++ -*- @@ -23,19 +24,81 @@ #include "YCPValue.h" -using std::binary_function; /* - * global comparison function to be used with STL-Containers as generic - * ordering operator. Compares two YCPValues and returns - * true if the first value is less than the second one, - * false otherwise. + * Global comparison functor usable as generic ordering operator for + * STL-containers and as predicate for STL-algorithms. + * + * Compares two YCPValues and returns true if the first value is less than the + * second one, false otherwise. Optionally the comparison is locale aware. */ +class ycp_less : public std::binary_function<YCPValue, YCPValue, bool> +{ + +public: + + ycp_less(bool respect_locale = false) : respect_locale(respect_locale) {} + + bool operator()(const YCPValue& x, const YCPValue& y) const + { + return x->compare(y, respect_locale) == YO_LESS; + } + +private: + + const bool respect_locale; + +}; + + +/* + * Global comparison functor usable as predicate for STL-algorithms. + * + * Compares two YCPValues and returns true if they are equal, false otherwise. + * Optionally the comparison is locale aware. + */ +class ycp_equal_to : public std::binary_function<YCPValue, YCPValue, bool> +{ + +public: + + ycp_equal_to(bool respect_locale = false) : respect_locale(respect_locale) {} -struct ycpless : public binary_function<YCPValue, YCPValue, bool> + bool operator()(const YCPValue& x, const YCPValue& y) const + { + return x->compare(y, respect_locale) == YO_EQUAL; + } + +private: + + const bool respect_locale; + +}; + + +/* + * Global comparison functor usable as predicate for STL-algorithms. + * + * Compares two YCPValues and returns true if they are not equal, false + * otherwise. Optionally the comparison is locale aware. + */ +class ycp_not_equal_to : public std::binary_function<YCPValue, YCPValue, bool> { - bool operator()(const YCPValue& x, const YCPValue& y) - const { return x->compare(y) == YO_LESS; }; + +public: + + ycp_not_equal_to(bool respect_locale = false) : respect_locale(respect_locale) {} + + bool operator()(const YCPValue& x, const YCPValue& y) const + { + return x->compare(y, respect_locale) != YO_EQUAL; + } + +private: + + const bool respect_locale; + }; + #endif // ycpless_h Modified: branches/tmp/lslezak/core/libycp/src/pathsearch.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/src/p… ============================================================================== --- branches/tmp/lslezak/core/libycp/src/pathsearch.cc (original) +++ branches/tmp/lslezak/core/libycp/src/pathsearch.cc Thu Jan 29 08:58:52 2009 @@ -48,6 +48,7 @@ static const int NUM_LEVELS = sizeof (paths) / sizeof (paths[0]); +bool Y2PathSearch::searchPrefixWarn = true; int Y2PathSearch::numberOfComponentLevels () @@ -178,6 +179,11 @@ pathname = completeFilename (pathname + filename); if (access (pathname.c_str(), mode) == 0) { + // FIXME: this check is different for clients and for modules - see find + if( searchPrefixWarn && i != NUM_LEVELS-1 ) + { + y2warning( "Using special search prefix '%s' for '%s'",searchPath (GENERIC, i).c_str(), pathname.c_str() ); + } return pathname; } } @@ -278,6 +284,8 @@ const char *home = getenv ("HOME"); const char *y2dir = getenv ("Y2DIR"); + searchPrefixWarn = (getenv ("Y2SILENTSEARCH") == NULL); + addPath (kind, string (YAST2DIR) + suffix); if (home) { @@ -329,6 +337,10 @@ if (access (pathname.c_str(), R_OK) == 0) { y2debug ("... success"); + // FIXME: this check is different for clients and for modules - see findy2 + if( searchPrefixWarn && *i != kindList.back () ) { + y2warning( "Using special search prefix '%s' for '%s'", i->c_str(), pathname.c_str() ); + } return pathname; } Modified: branches/tmp/lslezak/core/libycp/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/core/libycp/testsuite/Makefile.am Thu Jan 29 08:58:52 2009 @@ -14,13 +14,13 @@ noinst_PROGRAMS = testSignature runc runycp runc_SOURCES = runc.cc -runc_LDADD = ../src/libycp.la ../../liby2/src/liby2.la ${Y2UTIL_LIBS} +runc_LDADD = ../src/libycp.la ../src/libycpvalues.la ../../liby2/src/liby2.la ${Y2UTIL_LIBS} runycp_SOURCES = runycp.cc -runycp_LDADD = ../src/libycp.la ../../liby2/src/liby2.la ${Y2UTIL_LIBS} +runycp_LDADD = ../src/libycp.la ../src/libycpvalues.la ../../liby2/src/liby2.la ${Y2UTIL_LIBS} testSignature_SOURCES = testSignature.cc -testSignature_LDADD = ../src/libycp.la ../../liby2/src/liby2.la ${Y2UTIL_LIBS} +testSignature_LDADD = ../src/libycp.la ../src/libycpvalues.la ../../liby2/src/liby2.la ${Y2UTIL_LIBS} PACKAGE=libycp Modified: branches/tmp/lslezak/core/libycp/testsuite/runtest.sh URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== Binary files - no diff available. Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Float.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Float.ycp (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Float.ycp Thu Jan 29 08:58:52 2009 @@ -1,7 +1,7 @@ # --------------------------------------------------------- # -# Filename: Builtin-Integer.ycp +# Filename: Builtin-Float.ycp # # Purpose: test cases for all float builtins # Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.err URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.err (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.err Thu Jan 29 08:58:52 2009 @@ -141,7 +141,7 @@ ---------------------------------------------------------------------- list::reduce (integer x, integer y, [], { return (x + y); }) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List.ycp:73 Empty list [] for 'reduce' +[Interpreter] tests/builtin/Builtin-List.ycp:73 Empty list for 'reduce' Parsed: ---------------------------------------------------------------------- list::reduce (integer x, integer y, 0, [], { return (x + y); }) @@ -158,7 +158,7 @@ ---------------------------------------------------------------------- list::reduce (integer x, integer y, [], { return (x * y); }) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List.ycp:78 Empty list [] for 'reduce' +[Interpreter] tests/builtin/Builtin-List.ycp:78 Empty list for 'reduce' Parsed: ---------------------------------------------------------------------- list::reduce (integer x, integer y, 1, [], { return (x * y); }) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.ycp (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List.ycp Thu Jan 29 08:58:52 2009 @@ -83,3 +83,4 @@ (list::reduce (term t, float f, `item(`id(`dummy)), [], { return add(t, tostring(f)); })) (list::reduce (term t, float f, `item(`id(`dummy)), [3.14, 2.71], { return add(t, tostring(f)); })) + Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.err URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.err (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.err Thu Jan 29 08:58:52 2009 @@ -124,6 +124,23 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +"** isempty **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ([]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ([1, 2, 3]) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-List2.ycp:72 Argument (nil) to isempty(...) is nil +Parsed: +---------------------------------------------------------------------- "** size **" ---------------------------------------------------------------------- Parsed: @@ -166,12 +183,12 @@ ---------------------------------------------------------------------- "** change **" ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:90 Warning: change(...) is deprecated, please fix +[Parser] tests/builtin/Builtin-List2.ycp:97 Warning: change(...) is deprecated, please fix Parsed: ---------------------------------------------------------------------- change ([1, 4], 8) ---------------------------------------------------------------------- -[libycp] tests/builtin/Builtin-List2.ycp:90 Change does not work as expected! The argument is not passed by reference. +[libycp] tests/builtin/Builtin-List2.ycp:97 Change does not work as expected! The argument is not passed by reference. Parsed: ---------------------------------------------------------------------- "** remove **" @@ -184,34 +201,34 @@ ---------------------------------------------------------------------- remove ([], 0) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List2.ycp:96 Index 0 for remove () out of range +[Interpreter] tests/builtin/Builtin-List2.ycp:103 Index 0 for remove () out of range Parsed: ---------------------------------------------------------------------- "** select **" ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:101 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:108 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][-1]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:102 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:109 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][0]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:103 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:110 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][1]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:104 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:111 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- [1, 2][3]:42 ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-List2.ycp:105 Warning: 'select ()' is deprecated +[Parser] tests/builtin/Builtin-List2.ycp:112 Warning: 'select ()' is deprecated Parsed: ---------------------------------------------------------------------- /* any -> string */[1, "two"][0]:"wrong type" ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-List2.ycp:96 Can't convert value '1' to type 'string' +[Interpreter] tests/builtin/Builtin-List2.ycp:103 Can't convert value '1' to type 'string' Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.out (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.out Thu Jan 29 08:58:52 2009 @@ -27,6 +27,10 @@ ([true, 1, 1, 2]) ([8, 6, 3, 2]) ([8, 6, 3, 2]) +("** isempty **") +(true) +(false) +(nil) ("** size **") (0) (3) @@ -41,7 +45,7 @@ ([1, 4, 8]) ("** remove **") ([2]) -(nil) +([]) ("** select **") (42) (1) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-List2.ycp Thu Jan 29 08:58:52 2009 @@ -65,6 +65,13 @@ (sort (`x, `y, [ 3, 6, 2, 8 ], ``(x>y))) +("** isempty **") + +(isempty ([])) +(isempty ([1, 2, 3])) +(isempty ((list) nil)) + + ("** size **") (size ([])) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map.ycp Thu Jan 29 08:58:52 2009 @@ -75,6 +75,13 @@ (add ($[`a: 17, `b: 11], `b, nil)) +("** isempty **") + +(isempty ($[])) +(isempty ($[1:"a", 2:"b"])) +(isempty ((map) nil)) + + ("** size **") (size ($[])) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map3.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map3.out (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-Map3.out Thu Jan 29 08:58:52 2009 @@ -3,7 +3,7 @@ (0) (2) ("** remove **") -(nil) +($[1:2]) ($[]) ($[3:4]) ("** change **") Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.err URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.err (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.err Thu Jan 29 08:58:52 2009 @@ -1,5 +1,22 @@ Parsed: ---------------------------------------------------------------------- +"** isempty **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ("") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty ("linux") +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +isempty (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:15 Argument (nil) to isempty(...) is nil +Parsed: +---------------------------------------------------------------------- "** size **" ---------------------------------------------------------------------- Parsed: @@ -12,6 +29,11 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- +size (nil) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:22 Argument (nil) to size(...) is nil +Parsed: +---------------------------------------------------------------------- "** plus **" ---------------------------------------------------------------------- Parsed: @@ -94,7 +116,7 @@ ---------------------------------------------------------------------- substring ("some text", 42) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:48 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:56 Substring index out of range Parsed: ---------------------------------------------------------------------- substring ("some text", 5, 2) @@ -103,7 +125,37 @@ ---------------------------------------------------------------------- substring ("some text", 42, 2) ---------------------------------------------------------------------- -[Interpreter] tests/builtin/Builtin-String.ycp:51 Substring index out of range +[Interpreter] tests/builtin/Builtin-String.ycp:59 Substring index out of range +Parsed: +---------------------------------------------------------------------- +"** lsubstring **" +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +lsubstring ("some text", 5) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +lsubstring ("some text", 42) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:65 Substring index out of range +Parsed: +---------------------------------------------------------------------- +lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +lsubstring ("some text", 5, 2) +---------------------------------------------------------------------- +Parsed: +---------------------------------------------------------------------- +lsubstring ("some text", 42, 2) +---------------------------------------------------------------------- +[Interpreter] tests/builtin/Builtin-String.ycp:69 Substring index out of range +Parsed: +---------------------------------------------------------------------- +lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5, 2) +---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- "** mergestring **" @@ -116,9 +168,9 @@ ---------------------------------------------------------------------- mergestring (["abc", "dev", "ghi", ""], "/") ---------------------------------------------------------------------- -[Parser] tests/builtin/Builtin-String.ycp:58 No match for 'mergestring : <unspec> (list, string)' -[Parser] tests/builtin/Builtin-String.ycp:58 Please fix parameter types to match one of: -[Parser] tests/builtin/Builtin-String.ycp:58 'mergestring : string (const list <string>, string)' -[Parser] tests/builtin/Builtin-String.ycp:58 Wrong parameters in call to mergestring(...) -[Parser] tests/builtin/Builtin-String.ycp:58 Expected '(const list <string>, string)', seen '(list, string)'. +[Parser] tests/builtin/Builtin-String.ycp:77 No match for 'mergestring : <unspec> (list, string)' +[Parser] tests/builtin/Builtin-String.ycp:77 Please fix parameter types to match one of: +[Parser] tests/builtin/Builtin-String.ycp:77 'mergestring : string (const list <string>, string)' +[Parser] tests/builtin/Builtin-String.ycp:77 Wrong parameters in call to mergestring(...) +[Parser] tests/builtin/Builtin-String.ycp:77 Expected '(const list <string>, string)', seen '(list, string)'. runycp: parser error Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.out (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.out Thu Jan 29 08:58:52 2009 @@ -1,6 +1,11 @@ +("** isempty **") +(true) +(false) +(nil) ("** size **") (0) (5) +(nil) ("** plus **") ("YaST2") ("YaST2") @@ -22,6 +27,13 @@ ("") ("te") ("") +("** lsubstring **") +("text") +("") +("Ã½Ã¡Ã") +("te") +("") +("Ã½Ã¡") ("** mergestring **") ("/abc/dev/ghi") ("abc/dev/ghi/") Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.ycp (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-String.ycp Thu Jan 29 08:58:52 2009 @@ -8,10 +8,18 @@ # --------------------------------------------------------- +("** isempty **") + +(isempty ("")) +(isempty ("linux")) +(isempty ((string) nil)) + + ("** size **") (size ("")) (size ("linux")) +(size ((string) nil)) ("** plus **") @@ -51,6 +59,17 @@ (substring ("some text", 42, 2)) +("** lsubstring **") + +(lsubstring ("some text", 5)) +(lsubstring ("some text", 42)) +(lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5)) + +(lsubstring ("some text", 5, 2)) +(lsubstring ("some text", 42, 2)) +(lsubstring ("ÄÅ¡ÄÅÅ¾Ã½Ã¡Ã", 5, 2)) + + ("** mergestring **") (mergestring (["", "abc", "dev", "ghi"], "/")) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-remove.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-remove.out (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin-remove.out Thu Jan 29 08:58:52 2009 @@ -1 +1 @@ -(nil) +($[]) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.err URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.err (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.err Thu Jan 29 08:58:52 2009 @@ -12,7 +12,7 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- -remove ([1, 2, 3], 3) +(remove ([1, 2, 3], 3) == [1, 2, 3]) ---------------------------------------------------------------------- [Interpreter] tests/builtin/Builtin_X.ycp:4 Index 3 for remove () out of range Parsed: @@ -33,6 +33,6 @@ ---------------------------------------------------------------------- Parsed: ---------------------------------------------------------------------- -remove (`HBox (1, 2, 3), 4) +(remove (`HBox (1, 2, 3), 4) == `HBox (1, 2, 3)) ---------------------------------------------------------------------- [Interpreter] tests/builtin/Builtin_X.ycp:10 Index 4 for remove () out of range Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.out URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.out (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.out Thu Jan 29 08:58:52 2009 @@ -1,9 +1,9 @@ (true) (true) (true) -(nil) (true) (true) (true) (true) -(nil) +(true) +(true) Modified: branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libycp/tests… ============================================================================== --- branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.ycp (original) +++ branches/tmp/lslezak/core/libycp/testsuite/tests/builtin/Builtin_X.ycp Thu Jan 29 08:58:52 2009 @@ -1,10 +1,10 @@ ( remove([1,2,3],0) == [2,3] ) ( remove([1,2,3],1) == [1,3] ) ( remove([1,2,3],2) == [1,2] ) -remove([1,2,3],3) // error +( remove([1,2,3],3) == [1,2,3] ) // error // OLD: ( remove(`HBox(1,2,3),0) == [1,2,3] ) ( argsof(`HBox(1,2,3)) == [1,2,3] ) ( remove(`HBox(1,2,3),1) == `HBox(2,3) ) ( remove(`HBox(1,2,3),2) == `HBox(1,3) ) ( remove(`HBox(1,2,3),3) == `HBox(1,2) ) -remove(`HBox(1,2,3),4) // error +( remove(`HBox(1,2,3),4) == `HBox(1,2,3) ) // error Modified: branches/tmp/lslezak/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/package/yast… ============================================================================== --- branches/tmp/lslezak/core/package/yast2-core.changes (original) +++ branches/tmp/lslezak/core/package/yast2-core.changes Thu Jan 29 08:58:52 2009 @@ -1,4 +1,166 @@ ------------------------------------------------------------------- +Mon Jan 26 14:00:31 CET 2009 - mvidner(a)suse.cz + +- Fixed the D-Bus access policy (bnc#468390, CVE-2008-4311). +- 2.18.2 + +------------------------------------------------------------------- +Thu Jan 08 19:01:01 CET 2009 - aschnell(a)suse.de + +- added namespace multiset with 1. some list function, 2. some new + functions and 3. extended testsuite +- 2.18.1 + +------------------------------------------------------------------- +Wed Jan 07 15:17:23 CET 2009 - aschnell(a)suse.de + +- improved YCPList and YCPMap iterators + +------------------------------------------------------------------- +Mon Jan 5 15:20:56 CET 2009 - visnov(a)suse.cz + +- match WFM component name and component creator instance +- improve main page for doxygen + +------------------------------------------------------------------- +Mon Dec 22 13:16:02 CET 2008 - mvidner(a)suse.cz + +- Reverted r50800 which, in an attempt to fix another bug, encoded to + UTF-8 once too many, breaking i18n going thru Perl agents (bnc#448217). + +------------------------------------------------------------------- +Sat Dec 20 10:45:55 CET 2008 - aschnell(a)suse.de + +- added tosymbol builtin (bnc #192389) +- added isempty builtin for string, list and map +- 2.18.0 + +------------------------------------------------------------------- +Thu Dec 11 15:06:31 CET 2008 - lslezak(a)suse.cz + +- tty_wrapper - fixed a deadlock in tty setting (set the terminal + properties _before_ starting the subprocess) (bnc#458025) +- 2.17.25 + +------------------------------------------------------------------- +Tue Dec 9 13:20:49 CET 2008 - lslezak(a)suse.cz + +- SCR DBus service - check for the global permissions at first + (all method parameters are allowed) then for specific ones, + added .policy file with the default values (bnc#449794) +- 2.17.24 + +------------------------------------------------------------------- +Thu Nov 27 15:22:59 CET 2008 - lslezak(a)suse.cz + +- tty_wrapper - disable LF to CRLF translation on the stdout stream + (bnc#444228) +- 2.17.23 + +------------------------------------------------------------------- +Wed Nov 26 14:04:27 CET 2008 - visnov(a)suse.cz + +- added lsubstring builtin (bnc#446996) +- 2.17.22 + +------------------------------------------------------------------- +Sun Nov 9 15:35:43 CET 2008 - lslezak(a)suse.cz + +- added 'tty_wrapper' binary to start a yast module in commandline + mode without a tty device (bnc#444228) +- 2.17.21 + +------------------------------------------------------------------- +Mon Nov 3 11:55:50 CET 2008 - lslezak(a)suse.cz + +- fixed testing of the result of polkit_caller_new_from_dbus_name() + call which sometime sets the error object even when there is no + real error (bnc#439150) +- 2.17.20 + +------------------------------------------------------------------- +Fri Oct 24 15:54:54 CEST 2008 - visnov(a)suse.cz + +- Also print diff when agent-process testsuite fails +- 2.17.19 + +------------------------------------------------------------------- +Tue Oct 14 16:38:26 CEST 2008 - mvidner(a)suse.cz + +- Avoid YCPNull reaching SCR agents to prevent crashes (bnc#406138). +- Allow make check before make install again, after libycpvalues API + changed in 2.17.15. +- 2.17.18 + +------------------------------------------------------------------- +Tue Oct 14 14:41:34 CEST 2008 - lslezak(a)suse.cz + +- use atomic type sig_atomic_t in signal handlers (bnc#434509) + +------------------------------------------------------------------- +Sat Oct 11 12:30:03 CEST 2008 - mvidner(a)suse.cz + +- Handle EINTR in YCP scanner. Makes possible to toggle + debugging via SIGUSR1 to 'y2base stdio scr' (bnc#434253). +- 2.17.17 + +------------------------------------------------------------------- +Tue Oct 7 14:27:00 CEST 2008 - visnov(a)suse.cz + +- change remove builtin behavior to saner one (bnc #396697) +- more documentation updates +- 2.17.16 + +------------------------------------------------------------------- +Mon Sep 29 23:03:10 CEST 2008 - visnov(a)suse.cz + +- YCP values overview page added to docs + +------------------------------------------------------------------- +Fri Sep 26 16:09:22 CEST 2008 - visnov(a)suse.cz + +- new builtins: list::difference, list::symmetric_difference, + list::intersection, list::union (aschnell, bnc #58844) +- 2.17.15 + +------------------------------------------------------------------- +Fri Sep 26 12:17:35 CEST 2008 - visnov(a)suse.cz + +- allow clients to return exit code (bnc #350740) +- clean up documentation in liby2 +- 2.17.14 + +------------------------------------------------------------------- +Thu Sep 25 12:21:34 CEST 2008 - visnov(a)suse.cz + +- support SCR::RegisterAgent and SCR::UnregisterAgent in chroot + (bnc #425472) +- 2.17.13 + +------------------------------------------------------------------- +Wed Sep 17 15:49:42 CEST 2008 - visnov(a)suse.cz + +- Warn to log if using non-standard place for loading modules +- 2.17.12 + +------------------------------------------------------------------- +Tue Sep 9 15:49:07 CEST 2008 - visnov(a)suse.cz + +- Added y2useritem and y2usernote builtins for user-level + action log (Fate #100386) + +------------------------------------------------------------------- +Tue Sep 9 11:39:07 CEST 2008 - locilka(a)suse.cz + +- Adjusted STDOUT in ycp.pm to use 'utf8'. + +------------------------------------------------------------------- +Fri Sep 5 13:59:32 CEST 2008 - locilka(a)suse.cz + +- Added WFM::ClientExists function (needed for installation). +- 2.17.10 + +------------------------------------------------------------------- Wed Aug 27 12:13:27 CEST 2008 - locilka(a)suse.cz - Enabled getenv builtin. Modified: branches/tmp/lslezak/core/scr/src/ScriptingAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/scr/src/Scri… ============================================================================== --- branches/tmp/lslezak/core/scr/src/ScriptingAgent.cc (original) +++ branches/tmp/lslezak/core/scr/src/ScriptingAgent.cc Thu Jan 29 08:58:52 2009 @@ -284,6 +284,18 @@ { return UnmountAllAgents (); } + else if (sym == "RegisterAgent" + && term->size () == 2 + && term->value (0)->isPath ()) + { + return RegisterAgent (term->value (0)->asPath (), term->value (1)); + } + else if (sym == "UnregisterAgent" + && term->size () == 1 + && term->value (0)->isPath ()) + { + return UnregisterAgent (term->value (0)->asPath ()); + } else if (sym == "YaST2Version" || sym == "SuSEVersion") { // SuSEVersion is the older name (for historic reasons) Modified: branches/tmp/lslezak/core/scr/src/StdioSCRAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/scr/src/Stdi… ============================================================================== --- branches/tmp/lslezak/core/scr/src/StdioSCRAgent.cc (original) +++ branches/tmp/lslezak/core/scr/src/StdioSCRAgent.cc Thu Jan 29 08:58:52 2009 @@ -159,6 +159,63 @@ } +YCPBoolean +StdioSCRAgent::RegisterAgent (const YCPPath& path, const YCPValue& value) { + if (! m_handler) + return YCPNull (); + + y2debug( "This is StdioSCRAgent(%p)::RegisterAgent", this ); + + YCPTerm r ( "RegisterAgent" ); + r.add (path); + r.add (value); + + YCPValue v = m_handler->evaluate (r); + + if (v.isNull()) + { + ycp2error ("SCR::RegisterAgent() failed"); + return YCPNull (); + } + if (!v->isBoolean ()) + { + ycp2error ("SCR::RegisterAgent() did not return a boolean (%s)", v->toString().c_str()); + return YCPNull (); + } + + return v->asBoolean(); +} + + + +YCPBoolean +StdioSCRAgent::UnregisterAgent (const YCPPath& path) { + if (! m_handler) + return YCPNull (); + + y2debug( "This is StdioSCRAgent(%p)::UnregisterAgent", this ); + + YCPTerm r ( "UnregisterAgent" ); + r.add (path); + + YCPValue v = m_handler->evaluate (r); + + if (v.isNull()) + { + ycp2error ("SCR::UnregisterAgent() failed"); + return YCPNull (); + } + if (!v->isBoolean ()) + { + ycp2error ("SCR::UnregisterAgent() did not return a boolean (%s)", v->toString().c_str()); + return YCPNull (); + } + + return v->asBoolean(); +} + + + YCPValue StdioSCRAgent::otherCommand (const YCPTerm &term) { Modified: branches/tmp/lslezak/core/scr/src/StdioSCRAgent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/scr/src/Stdi… ============================================================================== --- branches/tmp/lslezak/core/scr/src/StdioSCRAgent.h (original) +++ branches/tmp/lslezak/core/scr/src/StdioSCRAgent.h Thu Jan 29 08:58:52 2009 @@ -56,8 +56,17 @@ virtual YCPMap Error (const YCPPath &path); /** - * Handle the commands 'UnregisterAgent', - * 'UnregisterAllAgents', 'MountAgent', 'MountAllAgents', + * Register an agent + */ + virtual YCPBoolean RegisterAgent (const YCPPath& path, const YCPValue& value); + + /** + * Unregister an agent + */ + virtual YCPBoolean UnregisterAgent (const YCPPath& path); + + /** + * Handle the commands 'UnregisterAllAgents', 'MountAgent', 'MountAllAgents', * 'UnmountAgent' and 'UnmountAllAgents'. */ YCPValue otherCommand (const YCPTerm &term); Modified: branches/tmp/lslezak/core/wfm/src/WFM.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/wfm/src/WFM.… ============================================================================== --- branches/tmp/lslezak/core/wfm/src/WFM.cc (original) +++ branches/tmp/lslezak/core/wfm/src/WFM.cc Thu Jan 29 08:58:52 2009 @@ -74,6 +74,12 @@ return Y2WFMComponent::instance ()->CallFunction (name); } +static YCPBoolean +WFMClientExists (const YCPString& name) +{ + return Y2WFMComponent::instance ()->ClientExists (name); +} + static YCPValue WFMCallFunction1 (const YCPString& name, const YCPList& args) { @@ -185,6 +191,7 @@ { "Write", "boolean (path, any, any)", (void*)WFMWrite3}, { "Write", "boolean (path, any)", (void*)WFMWrite2}, { "Execute", "any (path, any)", (void*)WFMExecute}, + { "ClientExists", "boolean (string)", (void*)WFMClientExists}, { 0 } }; Modified: branches/tmp/lslezak/core/wfm/src/Y2CCWFM.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/wfm/src/Y2CC… ============================================================================== --- branches/tmp/lslezak/core/wfm/src/Y2CCWFM.cc (original) +++ branches/tmp/lslezak/core/wfm/src/Y2CCWFM.cc Thu Jan 29 08:58:52 2009 @@ -213,4 +213,4 @@ } -Y2CCWFM g_y2ccWFM; +Y2CCWFM g_y2ccwfm; Modified: branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/wfm/src/Y2WF… ============================================================================== --- branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.cc (original) +++ branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.cc Thu Jan 29 08:58:52 2009 @@ -627,6 +627,44 @@ } +YCPBoolean +Y2WFMComponent::ClientExists (const YCPString& client) +{ + /** + * @builtin ClientExists + * @short Checks whether a YCP client exists + * @param string name client name + * + * @description + * This is similar to 'call' or 'CallFunction' but client is only + * checked for existence and not executed. If client exists + * 'true' is returned, otherwise 'false'. + * + * @usage ClientExists ("inst_mouse") -> true + * @usage ClientExists ("missing_client") -> false + * @return boolean whether client exists + */ + + string new_modulename = client->value (); + + if (client.isNull() || new_modulename == "") + { + y2error ("Client name not defined %s", new_modulename.c_str()); + return YCPBoolean (false); + } + + // try loading a client via Y2ComponentBroker + Y2Component* client_comp = Y2ComponentBroker::createClient (new_modulename.c_str ()); + if (client_comp) + { + return YCPBoolean (true); + } + else + { + return YCPBoolean (false); + } +} + YCPValue Y2WFMComponent::CallFunction (const YCPString& client, const YCPList& args) { Modified: branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/wfm/src/Y2WF… ============================================================================== --- branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.h (original) +++ branches/tmp/lslezak/core/wfm/src/Y2WFMComponent.h Thu Jan 29 08:58:52 2009 @@ -72,6 +72,7 @@ YCPValue Execute (const YCPPath &path, const YCPValue& arg1); YCPValue CallFunction (const YCPString& client, const YCPList& args = YCPList ()); YCPString GetEnvironmentEncoding (); + YCPBoolean ClientExists (const YCPString& client); virtual Y2Namespace* import (const char* name_space); Modified: branches/tmp/lslezak/core/wfm/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/wfm/testsuit… ============================================================================== --- branches/tmp/lslezak/core/wfm/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/core/wfm/testsuite/Makefile.am Thu Jan 29 08:58:52 2009 @@ -25,7 +25,8 @@ $(top_builddir)/scr/src/libpy2scr.la \ $(top_builddir)/libscr/src/libscr.la \ $(top_builddir)/libycp/src/libycp.la \ - $(top_builddir)/liby2/src/liby2.la \ + $(top_builddir)/libycp/src/libycpvalues.la \ + $(top_builddir)/liby2/src/liby2.la \ ${Y2UTIL_LIBS} runc_SOURCES = runc.cc @@ -34,6 +35,7 @@ $(top_builddir)/scr/src/libpy2scr.la \ $(top_builddir)/libscr/src/libscr.la \ $(top_builddir)/libycp/src/libycp.la \ + $(top_builddir)/libycp/src/libycpvalues.la \ $(top_builddir)/liby2/src/liby2.la \ ${Y2UTIL_LIBS} Modified: branches/tmp/lslezak/core/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/yast2-core.s… ============================================================================== --- branches/tmp/lslezak/core/yast2-core.spec.in (original) +++ branches/tmp/lslezak/core/yast2-core.spec.in Thu Jan 29 08:58:52 2009 @@ -84,6 +84,7 @@ %{_libdir}/lib*.so.* @ybindir@/y2base @ybindir@/startshell +@ybindir@/tty_wrapper @ybindir@/md_autorun @ybindir@/elf-arch @plugindir@/lib*.so.* @@ -105,6 +106,8 @@ # DBus service config /usr/share/dbus-1/system-services/org.opensuse.yast.SCR.service /etc/dbus-1/system.d/org.opensuse.yast.SCR.conf +# PolicyKit default policies +/usr/share/PolicyKit/policy/org.opensuse.yast.scr.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] r55131 - /tags/branch-Code-11-2_17_58/packager/
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 17:17:11 2009 New Revision: 55131 URL: http://svn.opensuse.org/viewcvs/yast?rev=55131&view=rev Log: Created tag branch-Code-11-2_17_58 for packager Added: tags/branch-Code-11-2_17_58/packager/ - copied from r55130, branches/SuSE-Code-11-Branch/packager/ -- 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] r55130 - /tags/branch-Code-11-2_17_58/
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 17:17:09 2009 New Revision: 55130 URL: http://svn.opensuse.org/viewcvs/yast?rev=55130&view=rev Log: Created tag branch-Code-11-2_17_58 Added: tags/branch-Code-11-2_17_58/ -- 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] r55129 - in /branches/SuSE-Code-11-Branch/packager: VERSION package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 17:17:00 2009 New Revision: 55129 URL: http://svn.opensuse.org/viewcvs/yast?rev=55129&view=rev Log: - do not remove kernel-xenpae package at update, it can be installed together with the standard kernel (bnc#468674) - 2.17.58 Modified: branches/SuSE-Code-11-Branch/packager/VERSION branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-Branch/packager/src/modules/Packages.ycp Modified: branches/SuSE-Code-11-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/packager/… ============================================================================== --- branches/SuSE-Code-11-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-Branch/packager/VERSION Wed Jan 28 17:17:00 2009 @@ -1 +1 @@ -2.17.57 +2.17.58 Modified: branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/packager/… ============================================================================== --- branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-Branch/packager/package/yast2-packager.changes Wed Jan 28 17:17:00 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 28 17:06:48 CET 2009 - lslezak(a)suse.cz + +- do not remove kernel-xenpae package at update, it can be + installed together with the standard kernel (bnc#468674) +- 2.17.58 + +------------------------------------------------------------------- Mon Jan 26 14:06:50 CET 2009 - lslezak(a)suse.cz - fixed another places logging complete URL including a password Modified: branches/SuSE-Code-11-Branch/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/packager/… ============================================================================== --- branches/SuSE-Code-11-Branch/packager/src/modules/Packages.ycp (original) +++ branches/SuSE-Code-11-Branch/packager/src/modules/Packages.ycp Wed Jan 28 17:17:00 2009 @@ -1855,6 +1855,7 @@ foreach (string one_kernel, kernels_to_be_installed, { // XEN can be installed in parallel if (one_kernel == "kernel-xen") return; + if (one_kernel == "kernel-xenpae") return; // don't remove the recommended one if (one_kernel == recommended_kernel) return; -- 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] r55128 - in /trunk/packager: package/yast2-packager.changes src/modules/Packages.ycp
by lslezak＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: lslezak Date: Wed Jan 28 17:13:20 2009 New Revision: 55128 URL: http://svn.opensuse.org/viewcvs/yast?rev=55128&view=rev Log: - do not remove kernel-xenpae package at update, it can be installed together with the standard kernel (bnc#468674) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/Packages.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jan 28 17:13:20 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 28 17:06:48 CET 2009 - lslezak(a)suse.cz + +- do not remove kernel-xenpae package at update, it can be + installed together with the standard kernel (bnc#468674) + +------------------------------------------------------------------- Mon Jan 26 14:06:50 CET 2009 - lslezak(a)suse.cz - fixed another places logging complete URL including a password Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Jan 28 17:13:20 2009 @@ -1855,6 +1855,7 @@ foreach (string one_kernel, kernels_to_be_installed, { // XEN can be installed in parallel if (one_kernel == "kernel-xen") return; + if (one_kernel == "kernel-xenpae") return; // don't remove the recommended one if (one_kernel == recommended_kernel) return; -- 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] r55127 - /tags/stable-2_18_3/installation/
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 17:10:35 2009 New Revision: 55127 URL: http://svn.opensuse.org/viewcvs/yast?rev=55127&view=rev Log: Created tag stable-2_18_3 for installation Added: tags/stable-2_18_3/installation/ - copied from r55126, trunk/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] r55126 - /trunk/installation/src/clients/inst_finish.ycp
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 17:09:53 2009 New Revision: 55126 URL: http://svn.opensuse.org/viewcvs/yast?rev=55126&view=rev Log: Final SlideShow update for now Modified: trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 28 17:09:53 2009 @@ -90,9 +90,13 @@ SlideShow::OpenDialog(); } + // Might be left from the previous stage + SlideShow::HideTable(); + SlideShow::MoveToStage("finish"); string log = _("Creating list of finish scripts to call..."); + SlideShow::SubProgress (0, ""); SlideShow::StageProgress (0, log); SlideShow::AppendMessageToInstLog (log); @@ -251,7 +255,14 @@ integer steps_count = 0; +integer stages_to_check = size (stages); +integer currently_checking = 0; + stages = maplist (map<string,any> stage, stages, { + currently_checking = currently_checking + 1; + SlideShow::SubProgress (100 * currently_checking / stages_to_check, + sformat (_("Checking stage: %1..."), stage["label"]:stage["id"]:"")); + list<map> steps = maplist (string s, stage["steps"]:[], { // some steps are called in live installer only if (s == "" || s == nil) { @@ -320,6 +331,7 @@ integer stages_nr = size (stages); integer current_stage = -1; integer current_stage_percent = 0; +string fallback_msg = nil; foreach (map<string,any> stage, stages, { if (stage["icon"]:"" != "") @@ -337,13 +349,13 @@ foreach (map step, stage["steps"]:[], { current_step = current_step + 1; - SlideShow::SubProgress (100 * current_step / steps_nr, nil); - SlideShow::StageProgress (current_stage_percent + (100 / stages_nr * current_step / steps_nr), nil); + // a fallback busy message + fallback_msg = sformat (_("Calling step %1..."), step["client"]:""); - if (haskey (step, "title")) { - // use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log - SlideShow::AppendMessageToInstLog (sformat (_(" * %1"), step["title"]:"")); - } + SlideShow::SubProgress (100 * current_step / steps_nr, step["title"]:fallback_msg); + SlideShow::StageProgress (current_stage_percent + (100 / stages_nr * current_step / steps_nr), nil); + // use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log + SlideShow::AppendMessageToInstLog (sformat (_(" * %1"), step["title"]:fallback_msg)); boolean orig = Progress::set (false); if (test_mode == true) { @@ -375,7 +387,7 @@ SlideShow::SubProgress (100, nil); }); -SlideShow::StageProgress (100, _("Finished")); +SlideShow::StageProgress (100, nil); SlideShow::AppendMessageToInstLog (_("Finished")); if (aborted) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0