archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Fixes to upgrade_attachment_schema() for URL-less projects

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-04-03 11:47:18 +02:00
parent 1cb3a24e2f
commit 14b31174dc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/cli/maintenance.py
View File

@ -634,8 +634,8 @@ def upgrade_attachment_schema(proj_url=None, all_projects=False, go=False):
nodes_coll = current_app.db('nodes') nodes_coll = current_app.db('nodes')
def replace_schemas(project): def replace_schemas(project):
log_proj = _single_logger('Upgrading schema project %s (%s)', project_url = project.get('url', '-no-url-')
project['url'], project['_id']) log_proj = _single_logger('Upgrading schema project %s (%s)', project_url, project['_id'])
orig_proj = copy.deepcopy(project) orig_proj = copy.deepcopy(project)
for proj_nt in project['node_types']: for proj_nt in project['node_types']:
@ -663,7 +663,7 @@ def upgrade_attachment_schema(proj_url=None, all_projects=False, go=False):
seen_changes = False seen_changes = False
for key, val1, val2 in doc_diff(orig_proj, project): for key, val1, val2 in doc_diff(orig_proj, project):
if not seen_changes: if not seen_changes:
log.info('Schema changes to project %s (%s):', project['url'], project['_id']) log.info('Schema changes to project %s (%s):', project_url, project['_id'])
seen_changes = True seen_changes = True
log.info(' - %30s: %s → %s', key, val1, val2) log.info(' - %30s: %s → %s', key, val1, val2)
@ -677,8 +677,9 @@ def upgrade_attachment_schema(proj_url=None, all_projects=False, go=False):
log.debug('Project saved succesfully.') log.debug('Project saved succesfully.')
def replace_attachments(project): def replace_attachments(project):
project_url = project.get('url', '-no-url-')
log_proj = _single_logger('Upgrading nodes for project %s (%s)', log_proj = _single_logger('Upgrading nodes for project %s (%s)',
project['url'], project['_id']) project_url, project['_id'])
# Remove empty attachments # Remove empty attachments
if go: if go: