Commit f2ddf4db authored by Nikos Skalkotos's avatar Nikos Skalkotos

Fix minor issues in output messages

parent fb2d189c
......@@ -389,7 +389,7 @@ class BundleVolume(object):
rsync.exclude(excl)
rsync.archive().hard_links().xattrs().sparse().acls()
rsync.run('/', target, 'host', 'tmp image')
rsync.run('/', target, 'host', 'temporary image')
# We need to replace the old UUID referencies with the new
# ones in grub configuration files and /etc/fstab for file
......@@ -433,9 +433,9 @@ class BundleVolume(object):
# Check if the available space is enough to host the image
dirname = os.path.dirname(image)
self.out.output("Examining available space in %s ..." % dirname, False)
self.out.output("Examining available space ..." % dirname, False)
if free_space(dirname) <= size:
raise FatalError('Not enough space in %s to host the image' %
raise FatalError('Not enough space under %s to host the image' %
dirname)
self.out.success("sufficient")
......
......@@ -133,6 +133,10 @@ def image_creator(d, media, out, tmp):
def select_file(d, media):
if media == '/':
return '/'
default = os.getcwd() + os.sep
while 1:
if media is not None:
......
......@@ -107,8 +107,7 @@ class Rsync:
self._out.success("%d" % total)
progress = self._out.Progress(total, "Copying %s files to %s" %
(slabel, dlabel))
progress = self._out.Progress(total, "Copying files to %s" % dlabel)
run = subprocess.Popen(cmd + [src, dest], shell=False,
stdout=subprocess.PIPE, bufsize=0)
try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment