from image_creator import util
from image_creator.disk import Disk
from image_creator.util import get_command, FatalError, MD5
-from image_creator.output import Output, Output_wth_progress, Silent, \
- Silent_wth_colors, error
-from image_creator.os_type import get_os_class
+from image_creator.output.cli import SilentOutput, SimpleOutput, \
+ OutputWthProgress
+from image_creator.os_type import os_cls
from image_creator.kamaki_wrapper import Kamaki
import sys
import os
"must be set")
if options.silent:
- out = Silent_wth_colors() if sys.stdout.isatty() else Silent()
+ out = SilentOutput()
else:
- out = Output_wth_progress() if sys.stdout.isatty() else Output()
+ out = OutputWthProgress(True) if sys.stderr.isatty() else \
+ SimpleOutput(False)
title = 'snf-image-creator %s' % version
out.output(title)
dev = disk.get_device(snapshot)
dev.mount()
- osclass = get_os_class(dev.distro, dev.ostype)
- image_os = osclass(dev.root, dev.g, out)
+ cls = os_cls(dev.distro, dev.ostype)
+ image_os = cls(dev.root, dev.g, out)
out.output()
for sysprep in options.disabled_syspreps:
ret = image_creator()
sys.exit(ret)
except FatalError as e:
- if sys.stdout.isatty():
- error(e)
- else:
- error(e, True, False)
+ colored = sys.stderr.isatty()
+ SimpleOutput(colored).error(e)
sys.exit(1)