Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
erp5_rtl_support
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
erp5_rtl_support
Commits
51328ef1
Commit
51328ef1
authored
Aug 19, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TemplateTool.upgradeSite: fix 'deprecated_reinstall_set' parameter
parent
63caf663
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
product/ERP5/Tool/TemplateTool.py
product/ERP5/Tool/TemplateTool.py
+6
-7
No files found.
product/ERP5/Tool/TemplateTool.py
View file @
51328ef1
...
@@ -1378,7 +1378,9 @@ class TemplateTool (BaseTool):
...
@@ -1378,7 +1378,9 @@ class TemplateTool (BaseTool):
imported_bt5 = self.download(url = download_url, id = id)
imported_bt5 = self.download(url = download_url, id = id)
bt_title = imported_bt5.getTitle()
bt_title = imported_bt5.getTitle()
if not reinstall:
if reinstall:
install_kw = None
else:
previous_bt5 = self.getInstalledBusinessTemplate(bt_title)
previous_bt5 = self.getInstalledBusinessTemplate(bt_title)
if (previous_bt5 is not None) and only_newer:
if (previous_bt5 is not None) and only_newer:
try:
try:
...
@@ -1429,9 +1431,6 @@ class TemplateTool (BaseTool):
...
@@ -1429,9 +1431,6 @@ class TemplateTool (BaseTool):
if update_catalog is _MARKER and install_kw != {}:
if update_catalog is _MARKER and install_kw != {}:
update_catalog = imported_bt5.isCatalogUpdatable()
update_catalog = imported_bt5.isCatalogUpdatable()
if reinstall:
imported_bt5.install(force=True,update_catalog=update_catalog)
else:
imported_bt5.install(object_to_update=install_kw,
imported_bt5.install(object_to_update=install_kw,
update_catalog=update_catalog)
update_catalog=update_catalog)
...
@@ -1525,7 +1524,7 @@ class TemplateTool (BaseTool):
...
@@ -1525,7 +1524,7 @@ class TemplateTool (BaseTool):
(bt5.title, bt5.version_state, (reinstall and '
(
reinstall
)
') or ''))
(bt5.title, bt5.version_state, (reinstall and '
(
reinstall
)
') or ''))
if not(dry_run):
if not(dry_run):
bt5_url = "%s/%s" % (bt5.repository, bt5.title)
bt5_url = "%s/%s" % (bt5.repository, bt5.title)
self.updateBusinessTemplateFromUrl(bt5_url)
self.updateBusinessTemplateFromUrl(bt5_url
, reinstall=reinstall
)
if delete_orphaned:
if delete_orphaned:
if keep_bt5_id_set is None:
if keep_bt5_id_set is None:
keep_bt5_id_set = set()
keep_bt5_id_set = set()
...
...
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