From 3eed077ae49dec9719662c9103b490f82ac4fce5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 7 Nov 2014 13:02:03 +0000 Subject: Move DISK_SIZE detection inside create_raw_disk_image --- morphlib/writeexts.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 9beb8dd2..a63c260e 100644 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -145,10 +145,7 @@ class WriteExtension(cliapp.Application): def create_local_system(self, temp_root, raw_disk): '''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) + self.create_raw_disk_image(raw_disk) try: self.mkfs_btrfs(raw_disk) mp = self.mount(raw_disk) @@ -212,9 +209,12 @@ class WriteExtension(cliapp.Application): '''Parse the virtual cpu count from environment.''' return self._parse_size_from_environment('VCPUS', '1') - def create_raw_disk_image(self, filename, size): + def create_raw_disk_image(self, filename): '''Create a raw disk image.''' + size = self.get_disk_size() + if not size: + raise cliapp.AppException('DISK_SIZE is not defined') self.status(msg='Creating empty disk image') with open(filename, 'wb') as f: if size > 0: -- cgit v1.2.1