Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
e28604d6
Commit
e28604d6
authored
Dec 04, 2020
by
Aurel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix exception for py3 in patch
parent
acf0fcbf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
component/egg-patch/Products.DCWorkflow/workflow_method.patch
...onent/egg-patch/Products.DCWorkflow/workflow_method.patch
+1
-1
stack/erp5/buildout-py3.cfg
stack/erp5/buildout-py3.cfg
+2
-2
No files found.
component/egg-patch/Products.DCWorkflow/workflow_method.patch
View file @
e28604d6
...
...
@@ -53,7 +53,7 @@ diff -uNr Products.DCWorkflow-2.2.4/Products/DCWorkflow/DCWorkflow.py Products.D
+ except ObjectDeleted:
+ # Re-raise with a different result.
+ raise ObjectDeleted(res)
+ except ObjectMoved
,
ex:
+ except ObjectMoved
as
ex:
+ # Re-raise with a different result.
+ raise ObjectMoved(ex.getNewObject(), res)
+ return res
...
...
stack/erp5/buildout-py3.cfg
View file @
e28604d6
...
...
@@ -31,12 +31,12 @@ eggs =
Products.CMFCore
Products.PythonScripts
Products.SiteErrorLog
Products.DCWorkflow
xml_marshaller
mysqlclient
Products.ZSQLMethods
Products.DCWorkflow
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#
7908d849d453a23c321a1a838abddadc
Products.DCWorkflow-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.DCWorkflow/workflow_method.patch#
e44faaf9953eee21124c572039ffecf1
Products.DCWorkflow-patch-options = -p1
[python]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment