From a86920fc7391ed5ab9b42ed310480e7fc73fc0c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 3 Apr 2018 12:24:42 +0200 Subject: [PATCH] Disallow spaces in attachment slugs --- pillar/api/node_types/__init__.py | 2 +- pillar/cli/maintenance.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pillar/api/node_types/__init__.py b/pillar/api/node_types/__init__.py index ebd9cfce..d6bd585d 100644 --- a/pillar/api/node_types/__init__.py +++ b/pillar/api/node_types/__init__.py @@ -7,7 +7,7 @@ _file_embedded_schema = { } } -ATTACHMENT_SLUG_REGEX = '[a-zA-Z0-9_ ]+' +ATTACHMENT_SLUG_REGEX = '[a-zA-Z0-9_]+' attachments_embedded_schema = { 'type': 'dict', diff --git a/pillar/cli/maintenance.py b/pillar/cli/maintenance.py index cfc9db2d..33a4d34e 100644 --- a/pillar/cli/maintenance.py +++ b/pillar/cli/maintenance.py @@ -867,6 +867,7 @@ def upgrade_attachment_usage(proj_url=None, all_projects=False, go=False): if status != 200: log.error('Error %i storing altered node %s %s', status, node['_id'], r) raise SystemExit('Error storing node; see log.') + log.debug('Updated node %s: %s', node['_id'], r) log.info('Project %s (%s) has %d nodes with attachments', proj_url, proj_id, node_count)