Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ayush Tiwari
erp5
Commits
bf93149d
Commit
bf93149d
authored
Jan 09, 2017
by
Ayush Tiwari
Committed by
Ayush Tiwari
Nov 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bt5_prototype: Refactor syntax error
parent
2022462a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
product/ERP5/Document/BusinessPackage.py
product/ERP5/Document/BusinessPackage.py
+1
-1
No files found.
product/ERP5/Document/BusinessPackage.py
View file @
bf93149d
...
@@ -475,7 +475,7 @@ def createInstallationData(package_list):
...
@@ -475,7 +475,7 @@ def createInstallationData(package_list):
else
:
else
:
# Leave the metadata in final_data in case the hash matches,
# Leave the metadata in final_data in case the hash matches,
# else add it to conflicted_data
# else add it to conflicted_data
if
final_data
[
path
][
'sha'
]
==
object_metadata
[
'sha'
]
if
final_data
[
path
][
'sha'
]
==
object_metadata
[
'sha'
]
:
continue
continue
else
:
else
:
conflicted_data
[
path
]
=
[
object_metadata
]
conflicted_data
[
path
]
=
[
object_metadata
]
...
...
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