From 861ee2270f257d3d5e2a840315b2b5a6f664ae20 Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Wed, 29 May 2013 11:04:27 +0000 Subject: Make create_local_system fail if DISK_SIZE isn't defined --- writeexts.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/writeexts.py b/writeexts.py index 9e98747c..df4cec33 100644 --- a/writeexts.py +++ b/writeexts.py @@ -53,6 +53,8 @@ class WriteExtension(cliapp.Application): '''Create a raw system image locally.''' size = self.get_disk_size() + if not size: + raise cliapp.AppException('DISK_SIZE is not defined') self.create_raw_disk_image(raw_disk, size) try: self.mkfs_btrfs(raw_disk) @@ -105,6 +107,8 @@ class WriteExtension(cliapp.Application): '''Parse a size from an environment variable.''' size = os.environ.get(env_var, default) + if size is None: + return None bytes = self._parse_size(size) if bytes is None: raise morphlib.Error('Cannot parse %s value %s' % (env_var, size)) @@ -112,7 +116,7 @@ class WriteExtension(cliapp.Application): def get_disk_size(self): '''Parse disk size from environment.''' - return self._parse_size_from_environment('DISK_SIZE', '1G') + return self._parse_size_from_environment('DISK_SIZE', None) def get_ram_size(self): '''Parse RAM size from environment.''' -- cgit v1.2.1