[ecflow] 18/50: update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:30:45 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository ecflow.
commit 8ffd9fb132cf593bd093b4e29c9b03cd67429aa6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed May 17 09:17:45 2017 +0100
update patches
---
debian/patches/auto_ptr.patch | 84 +++++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/debian/patches/auto_ptr.patch b/debian/patches/auto_ptr.patch
index 72beb5d..1be1a95 100644
--- a/debian/patches/auto_ptr.patch
+++ b/debian/patches/auto_ptr.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-03-22
Forwarded: no
-Index: ecflow-4.5.0/ANode/src/ExprDuplicate.cpp
+Index: ecflow-4.6.1/ANode/src/ExprDuplicate.cpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/ExprDuplicate.cpp
-+++ ecflow-4.5.0/ANode/src/ExprDuplicate.cpp
+--- ecflow-4.6.1.orig/ANode/src/ExprDuplicate.cpp
++++ ecflow-4.6.1/ANode/src/ExprDuplicate.cpp
@@ -45,13 +45,13 @@ ExprDuplicate::~ExprDuplicate()
duplicate_expr.clear();
}
@@ -24,10 +24,10 @@ Index: ecflow-4.5.0/ANode/src/ExprDuplicate.cpp
}
void ExprDuplicate::add(const std::string& expr,AstTop* ast)
-Index: ecflow-4.5.0/ANode/src/ExprDuplicate.hpp
+Index: ecflow-4.6.1/ANode/src/ExprDuplicate.hpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/ExprDuplicate.hpp
-+++ ecflow-4.5.0/ANode/src/ExprDuplicate.hpp
+--- ecflow-4.6.1.orig/ANode/src/ExprDuplicate.hpp
++++ ecflow-4.6.1/ANode/src/ExprDuplicate.hpp
@@ -24,7 +24,7 @@
// =========================================================================
@@ -46,10 +46,10 @@ Index: ecflow-4.5.0/ANode/src/ExprDuplicate.hpp
// Add the expr to the map, the ast is cloned.
static void add(const std::string& expr,AstTop*);
-Index: ecflow-4.5.0/ANode/src/NodeChange.cpp
+Index: ecflow-4.6.1/ANode/src/NodeChange.cpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/NodeChange.cpp
-+++ ecflow-4.5.0/ANode/src/NodeChange.cpp
+--- ecflow-4.6.1.orig/ANode/src/NodeChange.cpp
++++ ecflow-4.6.1/ANode/src/NodeChange.cpp
@@ -101,7 +101,7 @@ void Node::changeTrigger(const std::stri
{
PartExpression part(expression);
@@ -68,10 +68,10 @@ Index: ecflow-4.5.0/ANode/src/NodeChange.cpp
if (!ast.get()) {
std::stringstream ss;
ss << "Node::changeComplete: Failed to parse expression '" << expression << "'. " << parseErrorMsg;
-Index: ecflow-4.5.0/ANode/src/Expression.cpp
+Index: ecflow-4.6.1/ANode/src/Expression.cpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/Expression.cpp
-+++ ecflow-4.5.0/ANode/src/Expression.cpp
+--- ecflow-4.6.1.orig/ANode/src/Expression.cpp
++++ ecflow-4.6.1/ANode/src/Expression.cpp
@@ -65,7 +65,7 @@ std::ostream& PartExpression::print(std:
return os;
}
@@ -149,10 +149,10 @@ Index: ecflow-4.5.0/ANode/src/Expression.cpp
theCombinedAst_->exprType(exprType);
}
// cout << "****************************************************************\n";
-Index: ecflow-4.5.0/ANode/src/ExprParser.hpp
+Index: ecflow-4.6.1/ANode/src/ExprParser.hpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/ExprParser.hpp
-+++ ecflow-4.5.0/ANode/src/ExprParser.hpp
+--- ecflow-4.6.1.orig/ANode/src/ExprParser.hpp
++++ ecflow-4.6.1/ANode/src/ExprParser.hpp
@@ -17,7 +17,7 @@
//============================================================================
@@ -192,11 +192,11 @@ Index: ecflow-4.5.0/ANode/src/ExprParser.hpp
};
#endif
-Index: ecflow-4.5.0/Base/src/cts/AlterCmd.cpp
+Index: ecflow-4.6.1/Base/src/cts/AlterCmd.cpp
===================================================================
---- ecflow-4.5.0.orig/Base/src/cts/AlterCmd.cpp
-+++ ecflow-4.5.0/Base/src/cts/AlterCmd.cpp
-@@ -915,7 +915,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
+--- ecflow-4.6.1.orig/Base/src/cts/AlterCmd.cpp
++++ ecflow-4.6.1/Base/src/cts/AlterCmd.cpp
+@@ -1004,7 +1004,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
// Parse the expression
PartExpression exp(name);
string parseErrorMsg;
@@ -205,7 +205,7 @@ Index: ecflow-4.5.0/Base/src/cts/AlterCmd.cpp
if (!ast.get()) {
ss << "AlterCmd: change trigger: Failed to parse expression '" << name << "'. " << parseErrorMsg << "\n";
ss << dump_args(options,paths) << "\n";
-@@ -939,7 +939,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
+@@ -1024,7 +1024,7 @@ void AlterCmd::createChange( Cmd_ptr& cm
// Parse the expression
PartExpression exp(name);
string parseErrorMsg;
@@ -214,10 +214,10 @@ Index: ecflow-4.5.0/Base/src/cts/AlterCmd.cpp
if (!ast.get()) {
ss << "AlterCmd: change complete: Failed to parse expression '" << name << "'. " << parseErrorMsg << "\n";
ss << dump_args(options,paths) << "\n";
-Index: ecflow-4.5.0/view/src/host.cc
+Index: ecflow-4.6.1/view/src/host.cc
===================================================================
---- ecflow-4.5.0.orig/view/src/host.cc
-+++ ecflow-4.5.0/view/src/host.cc
+--- ecflow-4.6.1.orig/view/src/host.cc
++++ ecflow-4.6.1/view/src/host.cc
@@ -578,7 +578,7 @@ void host::dir( node& n, const char* pat
{
gui::message("%s: fetching file list", this->name());
@@ -245,11 +245,11 @@ Index: ecflow-4.5.0/view/src/host.cc
if (ldir.get()) {
l.scan(ldir.get());
}
-Index: ecflow-4.5.0/Base/src/cts/TaskCmds.cpp
+Index: ecflow-4.6.1/Base/src/cts/TaskCmds.cpp
===================================================================
---- ecflow-4.5.0.orig/Base/src/cts/TaskCmds.cpp
-+++ ecflow-4.5.0/Base/src/cts/TaskCmds.cpp
-@@ -410,7 +410,7 @@ CtsWaitCmd::CtsWaitCmd(const std::string
+--- ecflow-4.6.1.orig/Base/src/cts/TaskCmds.cpp
++++ ecflow-4.6.1/Base/src/cts/TaskCmds.cpp
+@@ -413,7 +413,7 @@ CtsWaitCmd::CtsWaitCmd(const std::string
// Parse expression to make sure its valid
PartExpression exp(expression);
string parseErrorMsg;
@@ -258,7 +258,7 @@ Index: ecflow-4.5.0/Base/src/cts/TaskCmds.cpp
if (!ast.get()) {
assert( !parseErrorMsg.empty() );
-@@ -441,7 +441,7 @@ STC_Cmd_ptr CtsWaitCmd::doHandleRequest(
+@@ -444,7 +444,7 @@ STC_Cmd_ptr CtsWaitCmd::doHandleRequest(
// Parse the expression
PartExpression exp(expression_);
string parseErrorMsg;
@@ -267,10 +267,10 @@ Index: ecflow-4.5.0/Base/src/cts/TaskCmds.cpp
if (!ast.get()) {
// should NOT really, since client did check
std::stringstream ss; ss << "CtsWaitCmd: Failed to parse expression '" << expression_ << "'. " << parseErrorMsg;
-Index: ecflow-4.5.0/ANode/src/Expression.hpp
+Index: ecflow-4.6.1/ANode/src/Expression.hpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/Expression.hpp
-+++ ecflow-4.5.0/ANode/src/Expression.hpp
+--- ecflow-4.6.1.orig/ANode/src/Expression.hpp
++++ ecflow-4.6.1/ANode/src/Expression.hpp
@@ -17,7 +17,7 @@
//============================================================================
@@ -302,11 +302,11 @@ Index: ecflow-4.5.0/ANode/src/Expression.hpp
Expression& operator=(Expression const& f);
private:
-Index: ecflow-4.5.0/ANode/test/TestExprParser.cpp
+Index: ecflow-4.6.1/ANode/test/TestExprParser.cpp
===================================================================
---- ecflow-4.5.0.orig/ANode/test/TestExprParser.cpp
-+++ ecflow-4.5.0/ANode/test/TestExprParser.cpp
-@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
+--- ecflow-4.6.1.orig/ANode/test/TestExprParser.cpp
++++ ecflow-4.6.1/ANode/test/TestExprParser.cpp
+@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
PartExpression part(vec[i]);
string parseErrorMsg;
@@ -314,8 +314,8 @@ Index: ecflow-4.5.0/ANode/test/TestExprParser.cpp
+ std::unique_ptr<AstTop> ast = part.parseExpressions( parseErrorMsg );
BOOST_REQUIRE_MESSAGE(ast.get(),"Failed to parse\n" << vec[i] << " " << parseErrorMsg);
-
-@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
+ std::stringstream s2;
+@@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE( test_expression_pa
PartExpression part(vec[i]);
string parseErrorMsg;
@@ -324,11 +324,11 @@ Index: ecflow-4.5.0/ANode/test/TestExprParser.cpp
BOOST_REQUIRE_MESSAGE(ast.get(),"Failed to parse " << vec[i] << " " << parseErrorMsg);
std::stringstream s2;
-Index: ecflow-4.5.0/ANode/src/ExprParser.cpp
+Index: ecflow-4.6.1/ANode/src/ExprParser.cpp
===================================================================
---- ecflow-4.5.0.orig/ANode/src/ExprParser.cpp
-+++ ecflow-4.5.0/ANode/src/ExprParser.cpp
-@@ -962,7 +962,7 @@ AstTop* createAst(
+--- ecflow-4.6.1.orig/ANode/src/ExprParser.cpp
++++ ecflow-4.6.1/ANode/src/ExprParser.cpp
+@@ -1000,7 +1000,7 @@ AstTop* createTopAst(
std::cout << "\nPRINT_AST_TRAVERSAL " << expr << "\n";
#endif
@@ -336,4 +336,4 @@ Index: ecflow-4.5.0/ANode/src/ExprParser.cpp
+ std::unique_ptr<AstTop> ast(new AstTop);
(void)doCreateAst(info.trees.begin(),rule_names,ast.get() );
- #if defined(PRINT_AST)
+ if (!ast->is_valid_ast(error_msg)) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git
More information about the debian-science-commits
mailing list