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
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
Ekaterina
erp5
Commits
c74c9299
Commit
c74c9299
authored
Dec 23, 2011
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updateBusinessTemplateFromUrl: clarify again code related to 'force_keep_list' parameter
parent
1de2d44b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
product/ERP5/Tool/TemplateTool.py
product/ERP5/Tool/TemplateTool.py
+4
-3
No files found.
product/ERP5/Tool/TemplateTool.py
View file @
c74c9299
...
@@ -1394,11 +1394,12 @@ class TemplateTool (BaseTool):
...
@@ -1394,11 +1394,12 @@ class TemplateTool (BaseTool):
# For actions which suggest that item shall be kept and item is not
# For actions which suggest that item shall be kept and item is not
# explicitely forced, keep the default -- do nothing
# explicitely forced, keep the default -- do nothing
in_force_keep_list = item in force_keep_list or state not in (
# XXX: '
force_keep_list
' variable is misnamed.
should_keep = item not in force_keep_list and state in (
'
Modified
but
should
be
kept
', '
Removed
but
should
be
kept
')
'
Modified
but
should
be
kept
', '
Removed
but
should
be
kept
')
# If item is forced to be untouched, do not touch it
# If item is forced to be untouched, do not touch it
if item in keep_original_list or
not in_force_keep_list
:
if item in keep_original_list or
should_keep
:
if
in_force_keep_list
:
if
not should_keep
:
log('
Item
%
r
is
in
force_keep_list
and
keep_original_list
,
'
log('
Item
%
r
is
in
force_keep_list
and
keep_original_list
,
'
'
as
keep_original_list
has
precedence
item
is
NOT
MODIFIED
'
'
as
keep_original_list
has
precedence
item
is
NOT
MODIFIED
'
% item)
% item)
...
...
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