February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55385 - /trunk/storage/libstorage/src/Graph.cc
by aschnell＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: aschnell Date: Tue Feb 10 13:18:42 2009 New Revision: 55385 URL: http://svn.opensuse.org/viewcvs/yast?rev=55385&view=rev Log: - use source/sink as rank for disk/mountpoint Modified: trunk/storage/libstorage/src/Graph.cc Modified: trunk/storage/libstorage/src/Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Graph.cc?… ============================================================================== --- trunk/storage/libstorage/src/Graph.cc (original) +++ trunk/storage/libstorage/src/Graph.cc Tue Feb 10 13:18:42 2009 @@ -47,8 +47,20 @@ }; - typedef array<NodeType, 5> Ranks; - const Ranks ranks = { { NODE_DISK, NODE_PARTITION, NODE_LVMVG, NODE_LVMLV, NODE_MOUNTPOINT } }; + struct Rank + { + Rank(NodeType type, const string& name) + : type(type), name(name) + {} + + NodeType type; + string name; + }; + + typedef array<Rank, 5> Ranks; + const Ranks ranks = { { Rank(NODE_DISK, "source"), Rank(NODE_PARTITION, "same"), + Rank(NODE_LVMVG, "same"), Rank(NODE_LVMLV, "same"), + Rank(NODE_MOUNTPOINT, "sink") } }; string dotQuote(const string& str) @@ -260,11 +272,11 @@ { list<string> ids; for (list<Node>::const_iterator node = nodes.begin(); node != nodes.end(); ++node) - if (node->type == *rank) + if (node->type == rank->type) ids.push_back(dotQuote(node->id)); if (!ids.empty()) - out << " { rank=same; " << boost::join(ids, " ") << " };" << endl; + out << " { rank=" << rank->name << "; " << boost::join(ids, " ") << " };" << endl; } out << endl; -- 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] r55384 - /tags/stable-2_18_2/devtools/
by mvidner＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mvidner Date: Tue Feb 10 13:14:44 2009 New Revision: 55384 URL: http://svn.opensuse.org/viewcvs/yast?rev=55384&view=rev Log: Created tag stable-2_18_2 for devtools Added: tags/stable-2_18_2/devtools/ - copied from r55383, trunk/devtools/ -- 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] r55383 - in /branches/tmp/lslezak/core/dbus/namespace_service: DBusModulesServer.cc DBusModulesServer.h
by lslezak＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: lslezak Date: Tue Feb 10 12:57:13 2009 New Revision: 55383 URL: http://svn.opensuse.org/viewcvs/yast?rev=55383&view=rev Log: - DBus service - added type checking Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.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 Tue Feb 10 12:57:13 2009 @@ -16,7 +16,7 @@ #include <y2/Y2PluginComponent.h> #include <ycp/y2log.h> -#include <ycp/YCPVoid.h> +#include <YCP.h> #include <ycp/pathsearch.h> #include <functional> @@ -237,6 +237,37 @@ return DBusServerBase::connect(SYSTEM, "org.opensuse.yast.modules"); } +/* + convert string starting with '`' to YCPSymbol + convert string starting with '.' to YCPPath +*/ +YCPValue DBusModulesServer::AutoCast(const YCPValue &value, constTypePtr requested_type) +{ + if (value->isString()) + { + std::string value_str(value->asString()->value()); + + if (requested_type->isSymbol()) + { + if (!value_str.empty() && value_str[0] == '`') + { + y2milestone("Automatic cast: string -> YCPSymbol"); + return YCPSymbol(value_str); + } + } + else if (requested_type->isPath()) + { + if (!value_str.empty() && value_str[0] == '.') + { + y2milestone("Automatic cast: string -> YCPPath"); + return YCPPath(value_str); + } + } + } + + return value; +} + DBusMsg DBusModulesServer::handler(const DBusMsg &request) { YCPValue ret; @@ -274,15 +305,44 @@ if (y2func) { int index = 0; + bool valid_arguments = true; while(index < reqarg) { YCPValue arg = request.getYCPValue(index); + + // check the data type compatibility + constTypePtr argtype(fptr->parameterType(index)); + + if (argtype->matchvalue(arg) < 0) + { + if (interface == "org.opensuse.yast.modules.Values") + { + // try converting DBus types to YCPValues in the raw interface + arg = AutoCast(arg, argtype); + // do the typecheck again + valid_arguments = argtype->matchvalue(arg) < 0; + } + else + { + valid_arguments = false; + } + + if (!valid_arguments) + { + y2error("Invalid argument %d (%s): Function %s::%s() requires type '%s' instead of '%s'", + index, arg->toString().c_str(), object.c_str(), method.c_str(), + argtype->toString().c_str(), Type::vt2type(arg->valuetype())->toString().c_str() + ); + break; + } + } + y2func->appendParameter(arg); index ++; } - if (y2func->finishParameters()) + if (valid_arguments && y2func->finishParameters()) { // call the function ret = y2func->evaluateCall(); 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 Tue Feb 10 12:57:13 2009 @@ -45,6 +45,9 @@ constTypePtr searchFuncType(const std::string &objname, const std::string &fname) const; std::string Y2Dtype(constTypePtr type) const; + // try to cast from a DBus value to the expected YCPValue + YCPValue AutoCast(const YCPValue &value, constTypePtr requested_type); + // register the functions from the namespace to DBus service void registerFunctions(const std::string &interface_prefix, bool do_marshalling); -- 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] r55382 - in /trunk/devtools: VERSION doxygen/Makefile.am doxygen/footer-notimestamp.html doxygen/ydoxygen package/yast2-devtools.changes
by mvidner＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mvidner Date: Tue Feb 10 12:50:56 2009 New Revision: 55382 URL: http://svn.opensuse.org/viewcvs/yast?rev=55382&view=rev Log: ydoxygen: omit timestamp in the output to avoid unnecessary rebuilds (bnc#474281). Modified: trunk/devtools/VERSION trunk/devtools/doxygen/Makefile.am trunk/devtools/doxygen/footer-notimestamp.html trunk/devtools/doxygen/ydoxygen trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=55382&r1=55… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Tue Feb 10 12:50:56 2009 @@ -1 +1 @@ -2.18.1 +2.18.2 Modified: trunk/devtools/doxygen/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/doxygen/Makefile.am?rev… ============================================================================== --- trunk/devtools/doxygen/Makefile.am (original) +++ trunk/devtools/doxygen/Makefile.am Tue Feb 10 12:50:56 2009 @@ -3,7 +3,7 @@ # devtoolsdatadir = $(ydatadir)/devtools -devtoolsdata_DATA = Doxyfile +devtoolsdata_DATA = Doxyfile footer-notimestamp.html ybin_SCRIPTS = ydoxygen EXTRA_DIST = $(devtoolsdata_DATA) $(ybin_SCRIPTS) Modified: trunk/devtools/doxygen/footer-notimestamp.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/doxygen/footer-notimest… ============================================================================== --- trunk/devtools/doxygen/footer-notimestamp.html (original) +++ trunk/devtools/doxygen/footer-notimestamp.html Tue Feb 10 12:50:56 2009 @@ -1,4 +1,4 @@ <hr size="1"><address style="text-align: right;"> -Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</address> +Generated on a sunny day for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</address> </body> </html> Modified: trunk/devtools/doxygen/ydoxygen URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/doxygen/ydoxygen?rev=55… ============================================================================== --- trunk/devtools/doxygen/ydoxygen (original) +++ trunk/devtools/doxygen/ydoxygen Tue Feb 10 12:50:56 2009 @@ -40,6 +40,10 @@ Replace a parameter in the template configuration file. Setting PROJECT_NAME also sets GENERATE_TAGFILE to $PROJECT_NAME.tag +ydoxygen sets HTML_FOOTER to .../footer-notimestamp.html to avoid +unnecessary rebuilds. To re-enable the default, pass "HTML_FOOTER=" +(bnc#474281). + =back =cut @@ -94,6 +98,9 @@ # - arguments my %replacements = (); + +$replacements{"HTML_FOOTER"} = "${y2datadir}/devtools/footer-notimestamp.html"; + foreach (@ARGV) { my ($param, $value) = split ('=', $_, 2); Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Tue Feb 10 12:50:56 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 10 12:49:57 CET 2009 - mvidner(a)suse.cz + +- ydoxygen: omit timestamps in the output to avoid unnecessary + rebuilds (bnc#474281). +- 2.18.2 + +------------------------------------------------------------------- Wed Feb 4 15:07:16 CET 2009 - mvidner(a)suse.cz - Added 'y2tool svnignore' to convert .cvsignore to svn:ignore (bnc#470981). -- 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] r55381 - /trunk/devtools/prefixbuild/recreate
by mvidner＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mvidner Date: Tue Feb 10 12:47:49 2009 New Revision: 55381 URL: http://svn.opensuse.org/viewcvs/yast?rev=55381&view=rev Log: - add a cmake search path - another module to use cmake * about time I integrated this properly... Modified: trunk/devtools/prefixbuild/recreate Modified: trunk/devtools/prefixbuild/recreate URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/prefixbuild/recreate?re… ============================================================================== --- trunk/devtools/prefixbuild/recreate (original) +++ trunk/devtools/prefixbuild/recreate Tue Feb 10 12:47:49 2009 @@ -73,7 +73,7 @@ mkdir -p _build cd _build - PATH=/opt/icecream/bin:/usr/lib/icecc/bin:$PATH cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DZYPP_PREFIX=$PREFIX -DSYSCONFDIR=$PREFIX/etc -DMANDIR=$PREFIX/share/man -DCMAKE_BUILD_TYPE=Debug .. + PATH=/opt/icecream/bin:/usr/lib/icecc/bin:$PATH cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_MODULE_PATH=$PREFIX/share/cmake/Modules -DZYPP_PREFIX=$PREFIX -DSYSCONFDIR=$PREFIX/etc -DMANDIR=$PREFIX/share/man -DCMAKE_BUILD_TYPE=Debug .. } function init_autotools() { @@ -127,7 +127,7 @@ pushd "$MODULE" case "$MODULE" in - zypper|libzypp|sat-solver|libyui-bindings|qt*) init_cmake "$MODULE";; + zypper|libzypp|sat-solver|libyui-bindings|ruby-bindings|qt*) init_cmake "$MODULE";; *) init_autotools "$MODULE";; esac -- 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] r55380 - /trunk/core/dbus/SCR_service/DBusServer.cc
by kkaempf＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: kkaempf Date: Tue Feb 10 12:43:12 2009 New Revision: 55380 URL: http://svn.opensuse.org/viewcvs/yast?rev=55380&view=rev Log: more comments Modified: trunk/core/dbus/SCR_service/DBusServer.cc Modified: trunk/core/dbus/SCR_service/DBusServer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/dbus/SCR_service/DBusServer… ============================================================================== --- trunk/core/dbus/SCR_service/DBusServer.cc (original) +++ trunk/core/dbus/SCR_service/DBusServer.cc Tue Feb 10 12:43:12 2009 @@ -48,13 +48,13 @@ } +// connect to DBus, request a service name bool DBusServer::connect() { - // connect to DBus, request a service name return connection.connect(DBUS_BUS_SYSTEM, YAST_SCR_SERVICE); } -// set idle timer +// reset idle timer void DBusServer::resetTimer() { ::alarm(TIMEOUT); @@ -71,6 +71,7 @@ } } +// register signal handler for idle timeout void DBusServer::registerSignalHandler() { struct sigaction new_action, old_action; @@ -86,10 +87,10 @@ } } +// check if clients are still running, +// remove finished clients bool DBusServer::canFinish() { - // check if clients are still running, - // remove finished clients for(Clients::iterator it = clients.begin(); it != clients.end();) { @@ -432,6 +433,7 @@ } #ifdef HAVE_POLKIT +// check if action is allowed by PolicyKit bool DBusServer::isActionAllowed(const std::string &caller, const std::string &path, const std::string &method, const std::string &arg, const std::string &opt) { -- 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] r55379 - /trunk/devtools/doxygen/footer-notimestamp.html
by mvidner＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: mvidner Date: Tue Feb 10 12:43:08 2009 New Revision: 55379 URL: http://svn.opensuse.org/viewcvs/yast?rev=55379&view=rev Log: Added the default doxygen footer, *with* timestamp, for the record. Added: trunk/devtools/doxygen/footer-notimestamp.html Added: trunk/devtools/doxygen/footer-notimestamp.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/doxygen/footer-notimest… ============================================================================== --- trunk/devtools/doxygen/footer-notimestamp.html (added) +++ trunk/devtools/doxygen/footer-notimestamp.html Tue Feb 10 12:43:08 2009 @@ -0,0 +1,4 @@ +<hr size="1"><address style="text-align: right;"> +Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</address> +</body> +</html> -- 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] r55378 - /tags/stable-2_18_5/installation/
by locilka＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: locilka Date: Tue Feb 10 12:36:25 2009 New Revision: 55378 URL: http://svn.opensuse.org/viewcvs/yast?rev=55378&view=rev Log: Created tag stable-2_18_5 for installation Added: tags/stable-2_18_5/installation/ - copied from r55377, 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] r55377 - /tags/stable-2_18_7/yast2/
by locilka＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: locilka Date: Tue Feb 10 12:35:37 2009 New Revision: 55377 URL: http://svn.opensuse.org/viewcvs/yast?rev=55377&view=rev Log: Created tag stable-2_18_7 for yast2 Added: tags/stable-2_18_7/yast2/ - copied from r55376, trunk/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] r55376 - /tags/stable-2_18_7/
by locilka＠svn.opensuse.org 10 Feb '09

10 Feb '09

Author: locilka Date: Tue Feb 10 12:35:35 2009 New Revision: 55376 URL: http://svn.opensuse.org/viewcvs/yast?rev=55376&view=rev Log: Created tag stable-2_18_7 Added: tags/stable-2_18_7/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0