From 35004031528b2eb86d53ef30d21dd58faeeaeba3 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Fri, 13 Jun 2014 10:07:08 +0000 Subject: Make the release script check for the system name not "release" --- scripts/do-release.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/do-release.py b/scripts/do-release.py index e11e6625..ce347632 100644 --- a/scripts/do-release.py +++ b/scripts/do-release.py @@ -154,14 +154,14 @@ class DeployImages(object): for system in release_cluster['systems']: system_morph = system['morph'] - if 'release' not in system['deploy']: + if system_morph not in system['deploy']: raise cliapp.AppException( - 'In release.morph: system %s ID should be "release"' % - system_morph) + 'In release.morph: system %s ID should be "%s"' % + (system_morph, system_morph)) # We can't override 'location' with a different value. We must use # what's already in the morphology, and check that it makes sense. - location = system['deploy']['release']['location'] + location = system['deploy'][system_morph]['location'] if not os.path.samefile(os.path.dirname(location), config.images_dir): raise cliapp.AppException( -- cgit v1.2.1