Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
erp5
Commits
5ddf02c7
Commit
5ddf02c7
authored
Nov 24, 2015
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix checkConsistency return value for BTree inconsistency case.
parent
5ecb1625
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
product/ERP5Type/Core/Folder.py
product/ERP5Type/Core/Folder.py
+3
-2
No files found.
product/ERP5Type/Core/Folder.py
View file @
5ddf02c7
...
@@ -42,6 +42,7 @@ from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
...
@@ -42,6 +42,7 @@ from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
from
Products.CMFCore.PortalFolder
import
ContentFilter
from
Products.CMFCore.PortalFolder
import
ContentFilter
from
Products.ERP5Type.Base
import
Base
from
Products.ERP5Type.Base
import
Base
from
Products.ERP5Type.ConsistencyMessage
import
ConsistencyMessage
from
Products.ERP5Type.CopySupport
import
CopyContainer
from
Products.ERP5Type.CopySupport
import
CopyContainer
from
Products.ERP5Type
import
PropertySheet
from
Products.ERP5Type
import
PropertySheet
from
Products.ERP5Type.XMLExportImport
import
Folder_asXML
from
Products.ERP5Type.XMLExportImport
import
Folder_asXML
...
@@ -1426,8 +1427,8 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
...
@@ -1426,8 +1427,8 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
if
not
btree_ok
:
if
not
btree_ok
:
# We must commit if we want to keep on recursing
# We must commit if we want to keep on recursing
transaction
.
savepoint
(
optimistic
=
True
)
transaction
.
savepoint
(
optimistic
=
True
)
error_list
+=
[
(
self
.
getRelativeUrl
(),
'BTree Inconsistency'
,
error_list
+=
[
ConsistencyMessage
(
199
,
'
(fixed)'
)]
self
,
self
.
getRelativeUrl
(),
'BTree Inconsistency
(fixed)'
)]
# Call superclass
# Call superclass
error_list
+=
Base
.
checkConsistency
(
self
,
fixit
=
fixit
,
filter
=
filter
,
**
kw
)
error_list
+=
Base
.
checkConsistency
(
self
,
fixit
=
fixit
,
filter
=
filter
,
**
kw
)
# We must commit before listing folder contents
# We must commit before listing folder contents
...
...
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