aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-08-27 12:35:19 +0000
committerSam Yaple <sam@yaple.net>2015-08-27 12:35:19 +0000
commit73ceb2af32a9a77f568d618dc5d39ee9f48cb906 (patch)
tree09a1e3a64c33d6e1338f1b7249574f8be179a44c
parentaada29b4dbf65eae105a59389813e96418e33bf5 (diff)
downloadkolla-73ceb2af32a9a77f568d618dc5d39ee9f48cb906.tar.gz
kolla-73ceb2af32a9a77f568d618dc5d39ee9f48cb906.zip
Fixes matching issue build.py
And issue would occur when the namespace contained a partial amount of the base distro's name causing the base and data images to assume they had parent images in Kolla instead of setting thier parent to None Change-Id: I3b39a3e232c3faa77ee78d1ebb26b7da17bd4df4 Closes-Bug: #1489021
-rwxr-xr-xkolla/cmd/build.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index d7d7c12e0..9800333a0 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -422,7 +422,7 @@ class KollaWorker(object):
image['name'] + ':' + self.tag
image['path'] = path
image['parent_name'] = content.split(' ')[1].split('\n')[0]
- if self.namespace not in image['parent_name']:
+ if not image['parent_name'].startswith(self.namespace + '/'):
image['parent'] = None
image['children'] = list()