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

CLI upgrade_attachment_schema: skip already upgraded nodes.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-10-27 10:38:02 +02:00
parent fe4d70c0d1
commit ab9d5c1793
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pillar/cli.py
View File

@@ -672,7 +672,6 @@ def upgrade_attachment_schema(proj_url=None, all_projects=False):
for proj_nt in project['node_types']: for proj_nt in project['node_types']:
nt_name = proj_nt['name'] nt_name = proj_nt['name']
if nt_name not in nts_by_name: if nt_name not in nts_by_name:
log.info(' - skipping node type "%s"', nt_name)
continue continue
log.info(' - replacing attachment schema on node type "%s"', nt_name) log.info(' - replacing attachment schema on node type "%s"', nt_name)
@@ -703,10 +702,14 @@ def upgrade_attachment_schema(proj_url=None, all_projects=False):
'properties.attachments': {'$exists': True}, 'properties.attachments': {'$exists': True},
}) })
for node in nodes: for node in nodes:
attachments = node[u'properties'][u'attachments']
if isinstance(attachments, dict):
# This node has already been upgraded.
continue
log.info(' - Updating schema on node %s (%s)', node['_id'], node.get('name')) log.info(' - Updating schema on node %s (%s)', node['_id'], node.get('name'))
new_atts = {} new_atts = {}
for field_info in attachments:
for field_info in node[u'properties'][u'attachments']:
for attachment in field_info.get('files', []): for attachment in field_info.get('files', []):
new_atts[attachment[u'slug']] = {u'oid': attachment[u'file']} new_atts[attachment[u'slug']] = {u'oid': attachment[u'file']}