diff options
-rwxr-xr-x | ssh-rsync.check | 7 | ||||
-rwxr-xr-x | ssh-rsync.write | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ssh-rsync.check b/ssh-rsync.check index 6a776ce9..11446c28 100755 --- a/ssh-rsync.check +++ b/ssh-rsync.check @@ -18,8 +18,9 @@ import cliapp -import morphlib.writeexts +import os +import morphlib.writeexts class SshRsyncCheckExtension(morphlib.writeexts.WriteExtension): def process_args(self, args): @@ -33,6 +34,10 @@ class SshRsyncCheckExtension(morphlib.writeexts.WriteExtension): 'Baserock machines. It cannot be used for an initial ' 'deployment.') + if os.environ.get('VERSION_LABEL', '') == '': + raise cliapp.AppException( + 'A VERSION_LABEL must be set when deploying an upgrade.') + location = args[0] self.check_ssh_connectivity(location) self.check_is_baserock_system(location) diff --git a/ssh-rsync.write b/ssh-rsync.write index 468e5a1f..775619ec 100755 --- a/ssh-rsync.write +++ b/ssh-rsync.write @@ -60,7 +60,7 @@ class SshRsyncWriteExtension(morphlib.writeexts.WriteExtension): self.complete_fstab_for_btrfs_layout(temp_root, uuid) - version_label = os.environ.get('VERSION_LABEL') + version_label = os.environ['VERSION_LABEL'] autostart = self.get_environment_boolean('AUTOSTART') self.status(msg='Creating remote mount point') |