Not only is this less lines of code, it is also faster.
Signed-off-by: Chris Lalancette clalance@redhat.com --- imagefactory.spec.in | 2 +- imgfac/builders/FedoraBuilder.py | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/imagefactory.spec.in b/imagefactory.spec.in index d025925..6b9a4ea 100644 --- a/imagefactory.spec.in +++ b/imagefactory.spec.in @@ -8,7 +8,7 @@ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Url: http://www.aeolusproject.org/imagefactory.html BuildArch: noarch -Requires: oz +Requires: oz >= 0.2.0 Requires: euca2ools Requires: python-qmf Requires: python-pycurl diff --git a/imgfac/builders/FedoraBuilder.py b/imgfac/builders/FedoraBuilder.py index f5c3bcb..567609d 100644 --- a/imgfac/builders/FedoraBuilder.py +++ b/imgfac/builders/FedoraBuilder.py @@ -173,14 +173,11 @@ class FedoraBuilder(BaseBuilder): self.log.debug("Doing base install via Oz") libvirt_xml = self.guest.install(self.app_config["timeout"]) self.image = self.guest.diskimage - self.log.debug("Base install complete - Doing customization") - self.percent_complete=30 - self.guest.customize(libvirt_xml) - self.log.debug("Customization complete") - self.percent_complete=50 - self.log.debug("Generating ICICLE") - self.output_descriptor = self.guest.generate_icicle(libvirt_xml) - self.log.debug("ICICLE generation complete") + self.log.debug("Base install complete - Doing customization and ICICLE generation") + self.percent_complete = 30 + self.output_descriptor = self.guest.customize_and_generate_icicle(libvirt_xml) + self.log.debug("Customization and ICICLE generation complete") + self.percent_complete = 50 except: self.log_exc() self.guest.cleanup_old_guest()