summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-29 14:31:11 +0000
committerGerrit Code Review <review@openstack.org>2018-10-29 14:31:11 +0000
commit475655ac5a71dfb29876a68c3f8a71208df35b18 (patch)
tree340f48dd76351749409ff754b34c1e3a7d97babd
parenta5deb49e7eb52d2814b64d5fd83e4006440f1358 (diff)
parent2ea808cae20ec655867e485d5c7fa2039626aba1 (diff)
Merge "fix: Correct .data path layering edge case"
-rw-r--r--deckhand/engine/layering.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/deckhand/engine/layering.py b/deckhand/engine/layering.py
index a3a72b3..952a31a 100644
--- a/deckhand/engine/layering.py
+++ b/deckhand/engine/layering.py
@@ -547,8 +547,13 @@ class DocumentLayering(object):
547 child_data = {} 547 child_data = {}
548 548
549 action_path = action['path'] 549 action_path = action['path']
550
550 if action_path.startswith('.data'): 551 if action_path.startswith('.data'):
551 action_path = action_path[5:] 552 action_path = action_path[5:]
553 elif action_path.startswith('$.data'):
554 action_path = action_path[6:]
555 if not (action_path.startswith('.') or action_path.startswith('$.')):
556 action_path = '.' + action_path
552 557
553 if method == self._DELETE_ACTION: 558 if method == self._DELETE_ACTION:
554 if action_path == '.': 559 if action_path == '.':