Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at 2014-08-11 12:30:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-core (Old) and /work/SRC/openSUSE:Factory/.yast2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-core" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-core/yast2-core.changes 2014-05-10 07:49:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-core.new/yast2-core.changes 2014-08-11 12:30:27.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 8 07:59:56 UTC 2014 - [email protected] + +- Pass SCR root path to stdio agents (bnc#879365). +- If aborting on a SCRAgent::targetPath assertion, log it + (bnc#891053). +- Fixed obvious compilation warnings. +- 3.1.8 + +------------------------------------------------------------------- Old: ---- yast2-core-3.1.7.tar.bz2 New: ---- yast2-core-3.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.k3AV2p/_old 2014-08-11 12:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.k3AV2p/_new 2014-08-11 12:30:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-core -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-core-3.1.7.tar.bz2 -> yast2-core-3.1.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/.dir-locals.el new/yast2-core-3.1.8/.dir-locals.el --- old/yast2-core-3.1.7/.dir-locals.el 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-core-3.1.8/.dir-locals.el 2014-08-08 16:49:48.000000000 +0200 @@ -0,0 +1,3 @@ +; https://www.gnu.org/software/emacs/manual/html_node/emacs/Directory-Variables.html#Directory-Variables +((c++-mode . ((indent-tabs-mode . nil) + (c-basic-offset . 4) ))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/agent-modules/src/ModulesConf.cc new/yast2-core-3.1.8/agent-modules/src/ModulesConf.cc --- old/yast2-core-3.1.7/agent-modules/src/ModulesConf.cc 2014-05-06 17:11:18.000000000 +0200 +++ new/yast2-core-3.1.8/agent-modules/src/ModulesConf.cc 2014-08-08 16:49:48.000000000 +0200 @@ -384,7 +384,7 @@ temp_line.erase(temp_line.find_last_not_of (WHITESPACE) + 1, temp_line.length ()); if (!temp_line.empty ()) - if (backslash = (temp_line.substr (temp_line.length () - 1) == "\\")) + if ((backslash = (temp_line.substr (temp_line.length () - 1) == "\\"))) line += temp_line.substr (0, temp_line.length () - 1); } while (backslash && is); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/libscr/src/SCRAgent.cc new/yast2-core-3.1.8/libscr/src/SCRAgent.cc --- old/yast2-core-3.1.7/libscr/src/SCRAgent.cc 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/libscr/src/SCRAgent.cc 2014-08-08 16:49:48.000000000 +0200 @@ -121,8 +121,10 @@ // we need full path if we have different root, otherwise // /mnt + tests/a.test result in /mnttests/a.test - if (path[0] != '/') + if (path[0] != '/') { + y2error("Root is not absolute, aborting: %s", path.c_str()); abort(); + } return string(root_path) + path; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/liby2util-r/src/miniini.cc new/yast2-core-3.1.8/liby2util-r/src/miniini.cc --- old/yast2-core-3.1.7/liby2util-r/src/miniini.cc 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/liby2util-r/src/miniini.cc 2014-08-08 16:49:48.000000000 +0200 @@ -40,7 +40,7 @@ continue; /* sections */ case '[': - *c++; + c++; c[strlen(c) - 1] = 0; strncpy(section, cutblanks(c), MAXLINE); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/libycp/src/YExpression.cc new/yast2-core-3.1.8/libycp/src/YExpression.cc --- old/yast2-core-3.1.7/libycp/src/YExpression.cc 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/libycp/src/YExpression.cc 2014-08-08 16:49:48.000000000 +0200 @@ -1666,7 +1666,7 @@ std::ostream & YEIs::toXml (std::ostream & str, int /*indent*/ ) const { - str << "<yeis "; m_type->toXml( str, 0); str; + str << "<yeis "; m_type->toXml( str, 0); commentToXml(str); str << ">"; str << "<expr>"; m_expr->toXml( str, 0); str << "</expr>"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/package/yast2-core.changes new/yast2-core-3.1.8/package/yast2-core.changes --- old/yast2-core-3.1.7/package/yast2-core.changes 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/package/yast2-core.changes 2014-08-08 16:49:48.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Aug 8 07:59:56 UTC 2014 - [email protected] + +- Pass SCR root path to stdio agents (bnc#879365). +- If aborting on a SCRAgent::targetPath assertion, log it + (bnc#891053). +- Fixed obvious compilation warnings. +- 3.1.8 + +------------------------------------------------------------------- Tue May 6 15:04:25 UTC 2014 - [email protected] - Do not mention YCP in signal handler (by tcech) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/package/yast2-core.spec new/yast2-core-3.1.8/package/yast2-core.spec --- old/yast2-core-3.1.7/package/yast2-core.spec 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/package/yast2-core.spec 2014-08-08 16:49:48.000000000 +0200 @@ -18,7 +18,7 @@ Name: yast2-core -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/scr/src/Makefile.am new/yast2-core-3.1.8/scr/src/Makefile.am --- old/yast2-core-3.1.7/scr/src/Makefile.am 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/scr/src/Makefile.am 2014-08-08 16:49:48.000000000 +0200 @@ -12,7 +12,6 @@ Y2CCSCR.cc Y2CCSCR.h \ Y2SCRComponent.cc Y2SCRComponent.h \ ScriptingAgent.cc ScriptingAgent.h \ - StdioSCRAgent.cc StdioSCRAgent.h \ SCRSubAgent.cc SCRSubAgent.h libpy2scr_la_LDFLAGS = -version-info 2:0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/scr/src/SCRSubAgent.cc new/yast2-core-3.1.8/scr/src/SCRSubAgent.cc --- old/yast2-core-3.1.7/scr/src/SCRSubAgent.cc 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/scr/src/SCRSubAgent.cc 2014-08-08 16:49:48.000000000 +0200 @@ -94,6 +94,15 @@ { my_comp->evaluate (term->value (i)); } + + if (strcmp(parent->root(), "/")) + { + ycpdebug("SetRoot(%s)", parent->root()); + + YCPTerm setRoot("SetRoot"); + setRoot->add(YCPString(parent->root())); + my_comp->evaluate(setRoot); + } } return YCPBoolean (true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/scr/src/StdioSCRAgent.cc new/yast2-core-3.1.8/scr/src/StdioSCRAgent.cc --- old/yast2-core-3.1.7/scr/src/StdioSCRAgent.cc 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/scr/src/StdioSCRAgent.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,229 +0,0 @@ - - -/* - * StdioSCRAgent.cc - * - * Basic SCR agent wrapper to push evaluation of builtins to another component using standard YCP - * - * Authors: Stanislav Visnovsky <[email protected]> - * Maintainer: Arvin Schnell <[email protected]> - * - * $Id$ - */ - - -#include <ycp/y2log.h> -#include <y2/Y2Component.h> -#include "StdioSCRAgent.h" - -YCPValue -StdioSCRAgent::Read (const YCPPath &path, const YCPValue &arg, const YCPValue &opt) -{ - if (! m_handler) - return YCPNull (); - - y2debug( "This is StdioSCRAgent(%p)::Read", this ); - - YCPTerm r ( "Read" ); - r.add (path); - if (!arg.isNull ()) - { - r.add (arg); - - if (! opt.isNull ()) - { - r.add (opt); - } - } - - return m_handler->evaluate (r); -} - - -YCPBoolean -StdioSCRAgent::Write (const YCPPath &path, const YCPValue &value, - const YCPValue &arg) -{ - if (! m_handler) - return YCPNull (); - - y2debug( "This is StdioSCRAgent(%p)::Write", this ); - - YCPTerm r ( "Write" ); - r.add (path); - - if (!value.isNull ()) - { - r.add (value); - - if (! arg.isNull ()) - { - r.add (arg); - } - } - else - { - r.add (YCPVoid ()); - } - - YCPValue v = m_handler->evaluate (r); - - if (v.isNull()) - { - ycp2error ("SCR::Write() failed"); - return YCPNull (); - } - if (!v->isBoolean ()) - { - ycp2error ("SCR::Write() did not return a boolean"); - return YCPNull (); - } - return v->asBoolean (); -} - - -YCPList -StdioSCRAgent::Dir (const YCPPath &path) -{ - if (! m_handler) - return YCPNull (); - - y2debug( "This is StdioSCRAgent(%p)::Dir", this ); - - YCPTerm r ( "Dir" ); - r.add (path); - - YCPValue v = m_handler->evaluate (r); - if (v.isNull()) - { - ycp2error ("SCR::Dir() failed"); - return YCPNull (); - } - if (!v->isList ()) - { - ycp2error ("SCR::Dir() did not return a list"); - return YCPNull (); - } - return v->asList (); -} - - -YCPValue -StdioSCRAgent::Execute (const YCPPath &path, const YCPValue &value, - const YCPValue &arg) -{ - if (! m_handler) - return YCPNull (); - - y2debug( "This is StdioSCRAgent(%p)::Execute", this ); - - YCPTerm r ( "Execute" ); - r.add (path); - if (!value.isNull ()) - { - r.add (value); - - if (! arg.isNull ()) - { - r.add (arg); - } - } - - return m_handler->evaluate (r); -} - - -YCPMap -StdioSCRAgent::Error (const YCPPath &path) -{ - if (! m_handler) - return YCPNull (); - - y2debug( "This is StdioSCRAgent(%p)::Error", this ); - - YCPTerm r ( "Error" ); - r.add (path); - - YCPValue v = m_handler->evaluate (r); - if (v.isNull()) - { - ycp2error ("SCR::Error() failed"); - return YCPNull (); - } - if (!v->isMap ()) - { - ycp2error ("SCR::Error() did not return a map"); - return YCPNull (); - } - return v->asMap (); -} - - -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) -{ - if (! m_handler) - return YCPNull (); - - y2error( "This is StdioSCRAgent(%p)::otherCommand (unhandled)", this ); - - return YCPNull (); -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/scr/src/StdioSCRAgent.h new/yast2-core-3.1.8/scr/src/StdioSCRAgent.h --- old/yast2-core-3.1.7/scr/src/StdioSCRAgent.h 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/scr/src/StdioSCRAgent.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -// -*- c++ -*- - -/* - * Authors: Stanislav Visnovsky <[email protected]> - * Maintainer: Arvin Schnell <[email protected]> - */ - - -#ifndef StdioSCRAgent_h -#define StdioSCRAgent_h - -#include <y2/Y2Component.h> -#include <scr/SCRAgent.h> - - -/** - * This agent is a proxy, which transforms a direct builtin call into - * Y2Component::evaluate () call. - */ -class StdioSCRAgent : public SCRAgent -{ - -public: - - StdioSCRAgent (Y2Component* handler) : m_handler (handler) {} - - ~StdioSCRAgent () {} - - /** - * Reads data. Destroy the result after use. - * @param path Specifies what part of the subtree should - * be read. The path is specified _relatively_ to Root()! - */ - virtual YCPValue Read (const YCPPath &path, const YCPValue &arg = YCPNull (), const YCPValue &opt = YCPNull ()); - - /** - * Writes data. Destroy the result after use. - */ - virtual YCPBoolean Write (const YCPPath &path, const YCPValue &value, - const YCPValue &arg = YCPNull ()); - - /** - * Get a list of all subtrees. - */ - virtual YCPList Dir (const YCPPath &path); - - /** - * Executes a command. - */ - virtual YCPValue Execute (const YCPPath &path, const YCPValue &value = - YCPNull (), const YCPValue &arg = YCPNull ()); - - /** - * Get a detailed error description if a previous command failed - */ - virtual YCPMap Error (const YCPPath &path); - - /** - * 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); - -private: - Y2Component* m_handler; -}; - - -#endif // StdioSCRAgent_h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.7/wfm/src/WFMSubAgent.cc new/yast2-core-3.1.8/wfm/src/WFMSubAgent.cc --- old/yast2-core-3.1.7/wfm/src/WFMSubAgent.cc 2014-05-06 17:11:19.000000000 +0200 +++ new/yast2-core-3.1.8/wfm/src/WFMSubAgent.cc 2014-08-08 16:49:48.000000000 +0200 @@ -21,7 +21,6 @@ #include <ycp/y2log.h> #include <y2/Y2ComponentBroker.h> #include <scr/SCRAgent.h> -#include "../../scr/src/StdioSCRAgent.h" #include <WFMSubAgent.h> @@ -34,7 +33,7 @@ // check if name is scr ( can be prepended by chroot like "chroot=/mnt:scr" ) if (name.find("scr") == string::npos && name.find("chroot") != string::npos) { - y2internal("WFMSubAgent support chrrot only for scr component, but not '%s'.", + y2internal("WFMSubAgent supports chroot only for scr component, but not '%s'.", name.c_str()); abort(); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
