Author: lslezak Date: Mon Jul 21 16:53:07 2008 New Revision: 49298 URL: http://svn.opensuse.org/viewcvs/yast?rev=49298&view=rev Log: - reverted some unnecessary changes before merging to the trunk Removed: branches/tmp/lslezak/workshop/core/agent-resolver/policy/ Modified: branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am branches/tmp/lslezak/workshop/core/libycp/doc/Makefile.am branches/tmp/lslezak/workshop/core/scr/src/Makefile.am branches/tmp/lslezak/workshop/core/wfm/src/Y2WFMComponent.cc Modified: branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am?rev=49298&r1=49297&r2=49298&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/workshop/core/libscr/testsuite/Makefile.am Mon Jul 21 16:53:07 2008 @@ -8,7 +8,6 @@ -I$(top_srcdir)/libycp/src/include \ -I$(top_srcdir)/liby2/src/include \ -I$(srcdir)/../src/include \ - -I$(srcdir)/../src/include \ ${Y2UTIL_CFLAGS} noinst_PROGRAMS = runscr Modified: branches/tmp/lslezak/workshop/core/libycp/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/libycp/doc/Makefile.am?rev=49298&r1=49297&r2=49298&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/libycp/doc/Makefile.am (original) +++ branches/tmp/lslezak/workshop/core/libycp/doc/Makefile.am Mon Jul 21 16:53:07 2008 @@ -7,9 +7,7 @@ builtin = $(wildcard $(srcdir)/../src/YCPBuiltin*.cc) builtinxml := $(builtin:%.cc=%.xml) xmlfiles := $(foreach xml,$(builtinxml),$(notdir $(xml))) -# DIS IS A HACK, DO NOT MERGE! -#do less so that we do not neen newer devtools for the workshop demo -htmlfiles = html/index.html +htmlfiles = $(wildcard html/*.html) html_DATA = \ Modified: branches/tmp/lslezak/workshop/core/scr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/scr/src/Makefile.am?rev=49298&r1=49297&r2=49298&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/scr/src/Makefile.am (original) +++ branches/tmp/lslezak/workshop/core/scr/src/Makefile.am Mon Jul 21 16:53:07 2008 @@ -32,3 +32,4 @@ INCLUDES = ${AGENT_INCLUDES} + Modified: branches/tmp/lslezak/workshop/core/wfm/src/Y2WFMComponent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/core/wfm/src/Y2WFMComponent.cc?rev=49298&r1=49297&r2=49298&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/core/wfm/src/Y2WFMComponent.cc (original) +++ branches/tmp/lslezak/workshop/core/wfm/src/Y2WFMComponent.cc Mon Jul 21 16:53:07 2008 @@ -552,11 +552,11 @@ if (arg.isNull ()) { - return local.agent ()->Read(p); + return local.agent ()->Read (p); } else { - return local.agent ()->Read(p, arg); + return local.agent ()->Read (p, arg); } } @@ -589,7 +589,7 @@ YCPPath p = path->at (1); - return local.agent ()->Write(p, arg1, arg2); + return local.agent ()->Write (p, arg1, arg2); } @@ -621,7 +621,7 @@ YCPPath p = path->at (1); - return local.agent ()->Execute(p, arg1); + return local.agent ()->Execute (p, arg1); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org