February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55815 - in /branches/tmp/lslezak/core: dbus/namespace_service/DBusModulesServer.cc dbus/namespace_service/DBusModulesServer.h liby2dbus/src/DBusServerBase.cc liby2dbus/src/DBusServerBase.h
by lslezak＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: lslezak Date: Fri Feb 27 14:54:34 2009 New Revision: 55815 URL: http://svn.opensuse.org/viewcvs/yast?rev=55815&view=rev Log: - DBus service - handle unknown requests, added autoimport functionality Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h 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 Feb 27 14:54:34 2009 @@ -76,7 +76,7 @@ y2milestone("Imported name space: %s, using object name: %s", nspace.c_str(), objname.c_str()); - nsmap[objname] = ns; + nsmap[YAST_DBUS_OBJ_PREFIX"/" + objname] = ns; return registerNamespace(ns); } @@ -131,15 +131,18 @@ parindex++; } + std::string namespace_str(nspace); + MakeValidObjectName(namespace_str); + if (params_ok_raw) { sig_raw.params = p_raw; // register the function: register_function(object, interface, method, signature, handler) - register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + namespace_str, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); } sig_marshalled.params = p_marshalled; - register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + namespace_str, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); return true; } @@ -258,6 +261,11 @@ constTypePtr DBusModulesServer::searchFuncType(const std::string &objname, const std::string &fname) const { + if (nsmap.find(objname) == nsmap.end()) + { + y2error("Object: %s not found", objname.c_str()); + return NULL; + } Y2Namespace *ns = nsmap.find(objname)->second; if (ns) @@ -374,12 +382,6 @@ std::string object(request.path()); std::string interface(request.interface()); - // remove the leading slash from the object name - if (!object.empty() && object[0] == '/') - { - object.erase(object.begin()); - } - y2debug("Requested object: %s, interface: %s, method: %s", object.c_str(), interface.c_str(), method.c_str()); constTypePtr t = searchFuncType(object, method); @@ -635,3 +637,47 @@ return retlist; } +// handle unknown requests +DBusMsg DBusModulesServer::unknownRequest(const DBusMsg &request) +{ + y2debug("Unknown request handler called"); + std::string req_path(request.path()); + DBusMsg reply; + + // subtree match + if (req_path.substr(0, sizeof(YAST_DBUS_OBJ_PREFIX) - 1) == YAST_DBUS_OBJ_PREFIX) + { + y2debug("Found object prefix " YAST_DBUS_OBJ_PREFIX " in request"); + std::string req_namespace(req_path, sizeof(YAST_DBUS_OBJ_PREFIX)); + + // hack: replace __ in request to :: to make a valid namespace + // DBus object name cannot contain :: + std::string::size_type pos = req_namespace.find("__"); + if (pos != std::string::npos) + { + req_namespace.replace(pos, 2, "::"); + } + + y2milestone("Autoimporting namespace %s...", req_namespace.c_str()); + + if (importNamespace(req_namespace)) + { + y2milestone("Import succeded, calling the handler again..."); + // call the handler again (polikt has already allowed the access) + reply = handler(request); + y2debug("Request handled"); + } + else + { + reply.createError(request, "Automatic import failed, unknown object", DBUS_ERROR_UNKNOWN_METHOD); + } + } + else + { + reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + } + + return reply; +} + + 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 Feb 27 14:54:34 2009 @@ -35,6 +35,8 @@ virtual actionList createActionId(const DBusMsg &msg); + // handle unknown requests + virtual DBusMsg unknownRequest(const DBusMsg &request); private: Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Fri Feb 27 14:54:34 2009 @@ -159,8 +159,8 @@ // create a reply to the message DBusMsg reply; - y2milestone("Received request from %s: interface: %s, method: %s", request.sender().c_str(), - request.interface().c_str(), request.method().c_str()); + y2milestone("Received request from %s: object: %s, interface: %s, method: %s", request.sender().c_str(), + request.path().c_str(), request.interface().c_str(), request.method().c_str()); // handle Introspection request from "org.freedesktop.DBus.Introspectable" "Introspect" if (request.isMethodCall(DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) @@ -247,12 +247,6 @@ // find the registered object std::string objname = request.path(); - // remove the slash at the beginning - if (objname.size() > 0 && objname[0] == '/') - { - objname.erase(objname.begin()); - } - // search the object Objects::const_iterator i = registered_objects.find(objname); @@ -297,14 +291,15 @@ if (!found) { - // report error - reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + // call unknown method handler + y2debug("Calling unknownRequest handler..."); + reply = unknownRequest(request); } } else { // report error - reply.createError(request, "Access denied, check PolicyKit priviledges", DBUS_ERROR_ACCESS_DENIED); + reply.createError(request, "Unknown method or access denied (check PolicyKit priviledges)", DBUS_ERROR_ACCESS_DENIED); } } else if (request.type() == DBUS_MESSAGE_TYPE_ERROR) @@ -461,6 +456,7 @@ DBusServerBase::actionList DBusServerBase::createActionId(const DBusMsg &msg) { + y2debug("Using default empty list of action IDs"); // default implementation is empty list // the inherited classes should redefine it return actionList(); @@ -498,3 +494,12 @@ } } } + +DBusMsg DBusServerBase::unknownRequest(const DBusMsg &request) +{ + DBusMsg err_reply; + y2error("Unknown object, interface or method"); + err_reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + + return err_reply; +} Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Fri Feb 27 14:54:34 2009 @@ -55,6 +55,9 @@ // create PolicyKit action ID for the received message virtual actionList createActionId(const DBusMsg &msg); + // handle unknown requests + virtual DBusMsg unknownRequest(const DBusMsg &request); + std::string service_name; -- 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] r55814 - /tags/stable-2_18_3/users/
by jsuchome＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsuchome Date: Fri Feb 27 14:08:17 2009 New Revision: 55814 URL: http://svn.opensuse.org/viewcvs/yast?rev=55814&view=rev Log: Created tag stable-2_18_3 for users Added: tags/stable-2_18_3/users/ - copied from r55813, trunk/users/ -- 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] r55813 - in /trunk/users: VERSION package/yast2-users.changes src/UsersSimple.pm src/dialogs.ycp src/inst_user_first.ycp
by jsuchome＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsuchome Date: Fri Feb 27 14:08:13 2009 New Revision: 55813 URL: http://svn.opensuse.org/viewcvs/yast?rev=55813&view=rev Log: - transliteration of UTF-8 accented characters to ASCII during name generation (bnc#442225) - 2.18.3 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersSimple.pm trunk/users/src/dialogs.ycp trunk/users/src/inst_user_first.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=55813&r1=55812… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Feb 27 14:08:13 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Feb 27 14:08:13 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 27 13:41:16 CET 2009 - jsuchome(a)suse.cz + +- transliteration of UTF-8 accented characters to ASCII during + name generation (bnc#442225) +- 2.18.3 + +------------------------------------------------------------------- Wed Feb 18 16:01:03 CET 2009 - jsuchome(a)suse.cz - ask for disabling autologin only when adding 2nd user(bnc#332729) Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=558… ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Fri Feb 27 14:08:13 2009 @@ -115,6 +115,7 @@ YaST::YCP::Import ("FileUtils"); YaST::YCP::Import ("Hostname"); YaST::YCP::Import ("InstExtensionImage"); +YaST::YCP::Import ("Language"); YaST::YCP::Import ("Mode"); YaST::YCP::Import ("NetworkService"); YaST::YCP::Import ("ProductControl"); @@ -1373,5 +1374,22 @@ sformat (__("Releasing %1 extension..."), "cracklib-dict-full.rpm")); } +##------------------------------------ +# use iconv transliteration feature to convert special characters to similar +# ASCII ones (bnc#442225) +BEGIN { $TYPEINFO{Transliterate} = ["function", "string", "string"]; } +sub Transliterate { + + my ($self, $text) = @_; + + return "" if ! $text; + my $language = Language->language (); + my $out = SCR->Execute (".target.bash_output", + "echo '$text' | iconv -f utf-8 -t ascii//translit", + { "LANG" => $language }); + my $stdout = $out->{"stdout"} || ""; + return $stdout; +} + 42 # EOF Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=55813&… ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Fri Feb 27 14:08:13 2009 @@ -966,6 +966,7 @@ { string full = (string)UI::QueryWidget (`id (ret), `Value); full = splitstring (full, " ")[0]:""; + full = UsersSimple::Transliterate (full); UI::ChangeWidget (`id (`username), `Value, tolower ( filterchars (full, UsersSimple::ValidLognameChars ())) ); Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?re… ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Fri Feb 27 14:08:13 2009 @@ -612,6 +612,7 @@ { string full = (string)UI::QueryWidget (`id (`cn), `Value); full = splitstring (full, " ")[0]:""; + full = UsersSimple::Transliterate (full); UI::ChangeWidget (`id (`username), `Value, tolower ( filterchars (full, UsersSimple::ValidLognameChars ())) ); -- 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] r55812 - /trunk/users/src/inst_auth.ycp
by jsuchome＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: jsuchome Date: Fri Feb 27 14:06:52 2009 New Revision: 55812 URL: http://svn.opensuse.org/viewcvs/yast?rev=55812&view=rev Log: check if package is installed before checking for availability Modified: trunk/users/src/inst_auth.ycp Modified: trunk/users/src/inst_auth.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_auth.ycp?rev=5581… ============================================================================== --- trunk/users/src/inst_auth.ycp (original) +++ trunk/users/src/inst_auth.ycp Fri Feb 27 14:06:52 2009 @@ -189,7 +189,7 @@ "samba" : "yast2-samba-client", "edir_ldap" : "yast2-linux-user-mgmt" ], { if (available == nil) return; - available = Package::Available (package); + available = Package::Installed (package) || Package::Available (package); if (available == true) available_clients = add (available_clients, client); }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55811 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h
by aschnell＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: aschnell Date: Fri Feb 27 12:28:54 2009 New Revision: 55811 URL: http://svn.opensuse.org/viewcvs/yast?rev=55811&view=rev Log: - reduced size of generated code for logging functions Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Fri Feb 27 12:28:54 2009 @@ -360,18 +360,22 @@ } -void -prepareLogStream(std::ostringstream& s) +ostringstream* +logStreamOpen() { - s.imbue(std::locale::classic()); - s.setf(std::ios::boolalpha); - s.setf(std::ios::showbase); + std::ostringstream* stream = new ostringstream; + + stream->imbue(std::locale::classic()); + stream->setf(std::ios::boolalpha); + stream->setf(std::ios::showbase); + + return stream; } void -logMsg(LogLevel level, const char* file, unsigned line, const char* func, - const string& str) +logStreamClose(LogLevel level, const char* file, unsigned line, const char* func, + ostringstream* stream) { using namespace blocxx; @@ -405,9 +409,11 @@ if (!category.empty()) { LogAppender::getCurrentLogAppender()->logMessage(LogMessage(component, category, - String(str), file, - line, func)); + String(stream->str()), + file, line, func)); } + + delete stream; } Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Fri Feb 27 12:28:54 2009 @@ -32,7 +32,7 @@ bool multipleDelim=true, bool skipEmpty=true, const string& quotes="" ); string mergeString( const std::list<string>& l, const string& del=" " ); -std::map<string,string> makeMap( const std::list<string>& l, +std::map<string,string> makeMap( const std::list<string>& l, const string& delim = "=", const string& removeSur = " \t\n" ); @@ -61,24 +61,23 @@ bool testLogLevel(LogLevel level); -void logMsg(LogLevel level, const char* file, unsigned line, - const char* func, const string& str); +std::ostringstream* logStreamOpen(); + +void logStreamClose(LogLevel level, const char* file, unsigned line, + const char* func, std::ostringstream*); -void prepareLogStream(std::ostringstream& s); - #define y2deb(op) y2log_op(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, op) #define y2mil(op) y2log_op(storage::MILESTONE, __FILE__, __LINE__, __FUNCTION__, op) #define y2war(op) y2log_op(storage::WARNING, __FILE__, __LINE__, __FUNCTION__, op) #define y2err(op) y2log_op(storage::ERROR, __FILE__, __LINE__, __FUNCTION__, op) -#define y2log_op(level, file, line, function, op) \ +#define y2log_op(level, file, line, func, op) \ do { \ if (storage::testLogLevel(level)) \ { \ - std::ostringstream __buf; \ - storage::prepareLogStream(__buf); \ - __buf << op; \ - storage::logMsg(level, file, line, function, __buf.str()); \ + std::ostringstream* __buf = storage::logStreamOpen(); \ + *__buf << op; \ + storage::logStreamClose(level, file, line, func, __buf); \ } \ } while (0) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55810 - /branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc
by lslezak＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: lslezak Date: Fri Feb 27 12:14:42 2009 New Revision: 55810 URL: http://svn.opensuse.org/viewcvs/yast?rev=55810&view=rev Log: - Dbus service - fixed removing trailing / from path name Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.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 Feb 27 12:14:42 2009 @@ -605,7 +605,7 @@ { if (obj[obj.size() - 1] == '/') { - obj.erase(obj.end()); + obj.erase(obj.size() - 1); } obj.erase(0, obj.rfind("/")); -- 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] r55809 - in /branches/tmp/lslezak/core: configure.in.in dbus/namespace_service/DBusModulesServer.cc dbus/namespace_service/Yast_dbus_names.h.in liby2dbus/src/DBusServerBase.cc
by lslezak＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: lslezak Date: Fri Feb 27 10:56:56 2009 New Revision: 55809 URL: http://svn.opensuse.org/viewcvs/yast?rev=55809&view=rev Log: - DBus service - use /org/opensuse/YaST/modules object prefix Modified: branches/tmp/lslezak/core/configure.in.in branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc 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 Fri Feb 27 10:56:56 2009 @@ -144,6 +144,8 @@ AC_SUBST(YAST_DBUS_YCP_INTERFACE) YAST_DBUS_MGR_INTERFACE=org.opensuse.YaST.modules.ModuleManager AC_SUBST(YAST_DBUS_MGR_INTERFACE) +YAST_DBUS_OBJ_PREFIX=/org/opensuse/YaST/modules +AC_SUBST(YAST_DBUS_OBJ_PREFIX) YAST_POLKIT_PREFIX_MANAGER=org.opensuse.yast.module-manager AC_SUBST(YAST_POLKIT_PREFIX_MANAGER) 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 Feb 27 10:56:56 2009 @@ -135,11 +135,11 @@ { sig_raw.params = p_raw; // register the function: register_function(object, interface, method, signature, handler) - register_method(nspace, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_RAW_INTERFACE, fname, sig_raw, e); } sig_marshalled.params = p_marshalled; - register_method(nspace, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); + register_method(YAST_DBUS_OBJ_PREFIX"/" + nspace, YAST_DBUS_YCP_INTERFACE, fname, sig_marshalled, e); return true; } @@ -221,12 +221,12 @@ sig.params = p; // register the manager object: register_function(object, interface, method, signature, handler) - register_method("", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_IMPORT_METHOD, sig, manager_callback); + register_method("/", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_IMPORT_METHOD, sig, manager_callback); DBusSignature void_sig; // register the manager object: register_function(object, interface, method, signature, handler) - register_method("", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_UNLOCK_METHOD, void_sig, manager_callback); - register_method("", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_LOCK_METHOD, void_sig, manager_callback); + register_method("/", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_UNLOCK_METHOD, void_sig, manager_callback); + register_method("/", YAST_DBUS_MGR_INTERFACE, YAST_DBUS_MANAGER_LOCK_METHOD, void_sig, manager_callback); } std::string DBusModulesServer::Y2Dtype(constTypePtr type) const @@ -599,10 +599,18 @@ ? YAST_POLKIT_PREFIX_MANAGER : YAST_POLKIT_PREFIX_MODULES); std::string obj(msg.path()); - + + // convert object path "/org/opensuse/yast/Label" to PolKit path "Label" if (!obj.empty()) { - if (obj[0] == '/') + if (obj[obj.size() - 1] == '/') + { + obj.erase(obj.end()); + } + + obj.erase(0, obj.rfind("/")); + + if (!obj.empty() && obj[0] == '/') { obj.erase(obj.begin()); } @@ -615,6 +623,7 @@ ret += '.' + msg.method(); + // make it valid action ID (lowercase chars, replace invalid chars) if (!PolKit::isValidActionID(ret)) { ret = PolKit::makeValidActionID(ret); Modified: branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/Yast_dbus_names.h.in Fri Feb 27 10:56:56 2009 @@ -9,6 +9,9 @@ // name of the Yast DBus service #define YAST_DBUS_SERVICE_NAME "@YAST_DBUS_SERVICE@" +// object(path) prefix +#define YAST_DBUS_OBJ_PREFIX "@YAST_DBUS_OBJ_PREFIX@" + // interface name for marshalled YCPValues - using (bsv) DBus structure #define YAST_DBUS_YCP_INTERFACE "@YAST_DBUS_YCP_INTERFACE@" // interface name for raw (direct) DBus values Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Fri Feb 27 10:56:56 2009 @@ -12,6 +12,8 @@ #include <ycp/y2log.h> +#include <algorithm> + // timeout for reading a DBus message (in miliseconds) #define YAST_DBUS_TIMEOUT_VALUE 15000 // the count of timeout events before exiting @@ -164,12 +166,7 @@ if (request.isMethodCall(DBUS_INTERFACE_INTROSPECTABLE, "Introspect")) { y2milestone("Introspecting object: %s", request.path().c_str()); - std::string introspect; - - // root node? - if (request.path() == "/") - { - introspect = + std::string introspect( // introcpection data for the root node DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "\n<node>\n" @@ -177,65 +174,65 @@ " <method name='Introspect'>\n" " <arg name='xml_data' type='s' direction='out'/>\n" " </method>\n" - " </interface>\n"; + " </interface>\n"); + + // add "static" methods (with empty object) + std::string requested_path(request.path()); + + std::list<std::string> announced_objects; - // add "static" methods (with empty object) + for(Objects::const_iterator i = registered_objects.begin(); + i != registered_objects.end(); + ++i) + { + std::string object(i->first); - for(Objects::const_iterator i = registered_objects.begin(); - i != registered_objects.end(); - ++i) + // exact match or a subtree match? + if (object != requested_path) { - std::string object(i->first); + std::string obj_prefix(object, 0, requested_path.size()); - if (!object.empty()) + // subtree match + if (obj_prefix == requested_path) { - introspect += " <node name='" + object + "'/>\n"; - } - else - { - introspect += CreateObjectIntrospection(i->second); - } - } + y2debug("Object: %s, Requested path: %s, Prefix: %s", object.c_str(), + requested_path.c_str(), obj_prefix.c_str() + ); - // close the node section - introspect += "</node>\n"; - } - else - { - introspect = - // introcpection data for the root node - DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE - "\n<node>\n" - " <interface name='"DBUS_INTERFACE_INTROSPECTABLE"'>\n" - " <method name='Introspect'>\n" - " <arg name='xml_data' type='s' direction='out'/>\n" - " </method>\n" - " </interface>\n"; + std::string sub_path(object, obj_prefix.size()); + if (sub_path.size() > 0 && sub_path[0] == '/') + { + sub_path.erase(sub_path.begin()); + } - std::string objname = request.path(); + y2debug("sub_path: %s", sub_path.c_str()); - // remove the slash at the beginning - if (objname.size() > 0 && objname[0] == '/') - { - objname.erase(objname.begin()); - } + std::string node_name(sub_path, 0, sub_path.find("/")); + if (node_name.size() > 0 && node_name[0] == '/') + { + node_name.erase(node_name.begin()); + } - // return properties of the registered object only - Objects::const_iterator i = registered_objects.find(objname); - - if (i == registered_objects.end()) - { - y2warning("Requested object %s is not registered", objname.c_str()); + y2debug("Using node name: %s", node_name.c_str()); + + // check if it has been already added + if (find(announced_objects.begin(), announced_objects.end(), node_name) + == announced_objects.end()) + { + introspect += " <node name='" + node_name + "'/>\n"; + announced_objects.push_back(node_name); + } + } } else { - ObjectData od = i->second; - introspect += CreateObjectIntrospection(od); + introspect += CreateObjectIntrospection(i->second); } - - introspect += " </node>\n"; } + // close the node section + introspect += "</node>\n"; + // create a reply to the request reply.createReply(request); reply.addString(introspect.c_str()); -- 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] r55808 - /trunk/devtools/y2logview/y2log_ana/Makefile.am
by mvidner＠svn.opensuse.org 27 Feb '09

27 Feb '09

Author: mvidner Date: Fri Feb 27 10:22:14 2009 New Revision: 55808 URL: http://svn.opensuse.org/viewcvs/yast?rev=55808&view=rev Log: Added long forgotten files Modified: trunk/devtools/y2logview/y2log_ana/Makefile.am Modified: trunk/devtools/y2logview/y2log_ana/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/y2logview/y2log_ana/Mak… ============================================================================== --- trunk/devtools/y2logview/y2log_ana/Makefile.am (original) +++ trunk/devtools/y2logview/y2log_ana/Makefile.am Fri Feb 27 10:22:14 2009 @@ -19,8 +19,10 @@ y2log_ana_LDADD = $(Qt4_LIBS) y2log_ana_SOURCES = cgui.cc \ + cgui.h \ cman.cc \ cy2log.cc \ + cy2log.h \ cgui.moc.cc %.moc.cc: %.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] r55807 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 23:17:51 2009 New Revision: 55807 URL: http://svn.opensuse.org/viewcvs/yast?rev=55807&view=rev Log: - fixed typo Modified: trunk/storage/storage/src/modules/Storage.ycp 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 Feb 26 23:17:51 2009 @@ -2480,7 +2480,7 @@ * @param string device name * @param string disk * @param integer new_cyls (in cylinders) - * @return boolean if successfull + * @return boolean if successful */ global boolean ResizePartition(string device, string disk, integer new_cyls) { @@ -2500,7 +2500,7 @@ * @param string device name * @param string disk * @param integer new_size (in kBytes) - * @return boolean if successfull + * @return boolean if successful */ global boolean ResizeVolume(string device, string disk, integer new_size_k) { -- 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] r55806 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h StorageCallbacks.cc
by aschnell＠svn.opensuse.org 26 Feb '09

26 Feb '09

Author: aschnell Date: Thu Feb 26 22:49:55 2009 New Revision: 55806 URL: http://svn.opensuse.org/viewcvs/yast?rev=55806&view=rev Log: - removed old logging functions Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/StorageCallbacks.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Feb 26 22:49:55 2009 @@ -411,27 +411,6 @@ } -void -logMsgVaArgs(LogLevel level, const char* file, unsigned line, const char* func, - const char* format, ...) -{ - if (testLogLevel(level)) - { - char* str; - va_list ap; - - va_start(ap, format); - if (vasprintf(&str, format, ap) == -1) - return; - va_end(ap); - - logMsg(level, file, line, func, str); - - free(str); - } -} - - int readlink(const char* path, string& buf) { Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Feb 26 22:49:55 2009 @@ -64,21 +64,8 @@ void logMsg(LogLevel level, const char* file, unsigned line, const char* func, const string& str); -void logMsgVaArgs(LogLevel level, const char* file, unsigned line, - const char* func, const char* format, ...) - __attribute__ ((format(printf, 5, 6))); - void prepareLogStream(std::ostringstream& s); -#define y2debug(format, ...) \ - logMsgVaArgs(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) -#define y2milestone(format, ...) \ - logMsgVaArgs(storage::MILESTONE, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) -#define y2warning(format, ...) \ - logMsgVaArgs(storage::WARNING, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) -#define y2error(format, ...) \ - logMsgVaArgs(storage::ERROR, __FILE__, __LINE__, __FUNCTION__, format, ##__VA_ARGS__) - #define y2deb(op) y2log_op(storage::DEBUG, __FILE__, __LINE__, __FUNCTION__, op) #define y2mil(op) y2log_op(storage::MILESTONE, __FILE__, __LINE__, __FUNCTION__, op) #define y2war(op) y2log_op(storage::WARNING, __FILE__, __LINE__, __FUNCTION__, op) Modified: trunk/storage/libstorage/src/StorageCallbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageCa… ============================================================================== --- trunk/storage/libstorage/src/StorageCallbacks.cc (original) +++ trunk/storage/libstorage/src/StorageCallbacks.cc Thu Feb 26 22:49:55 2009 @@ -36,11 +36,6 @@ #include <y2/Y2Component.h> #include <y2/Y2ComponentBroker.h> -#undef y2milestone -#undef y2error -#undef y2warning -#undef y2debug - #include <Storage.h> using namespace storage; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0