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
0e4488e9
Commit
0e4488e9
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_package: Update createInstallationData function to remove data from conflicted_data list
parent
39883f2b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
product/ERP5/Document/BusinessPackage.py
product/ERP5/Document/BusinessPackage.py
+5
-2
No files found.
product/ERP5/Document/BusinessPackage.py
View file @
0e4488e9
...
@@ -452,7 +452,7 @@ def createInstallationData(package_list):
...
@@ -452,7 +452,7 @@ def createInstallationData(package_list):
for
package
in
package_list
:
for
package
in
package_list
:
path_list
.
extend
(
package
.
getTemplatePathList
())
path_list
.
extend
(
package
.
getTemplatePathList
())
path_list
=
list
(
set
(
path_list
))
path_list
=
list
(
set
(
path_list
))
import
copy
for
package
in
package_list
:
for
package
in
package_list
:
obj_dict
=
package
.
_path_item
.
_objects
obj_dict
=
package
.
_path_item
.
_objects
hash_dict
=
package
.
_path_item
.
_hash
hash_dict
=
package
.
_path_item
.
_hash
...
@@ -474,11 +474,14 @@ def createInstallationData(package_list):
...
@@ -474,11 +474,14 @@ def createInstallationData(package_list):
# compare hash of the objects
# compare hash of the objects
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
and remove the older
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
]
conflict_object_metadata
=
copy
.
copy
(
final_data
[
path
])
conflicted_data
[
path
].
append
(
conflict_object_metadata
)
del
final_data
[
path
]
return
final_data
,
conflicted_data
return
final_data
,
conflicted_data
...
...
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