summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-08-19 12:14:21 +0300
committerLars Wirzenius <liw@liw.fi>2018-08-19 12:14:21 +0300
commitdc80d005623d45183a4678705b88def7b2224acc (patch)
tree1fb4bb9fbbf28dc48c5c3e0a208ab5c3a57661dd
parente8f2b52bb5e0c2c56358906ec1c92bf7dfcb2b35 (diff)
downloadvmdb2-dc80d005623d45183a4678705b88def7b2224acc.tar.gz
Drop: pointless progress reporting
The runcmd function reports what it does already, these progress reports don't actually seem to me to help much.
-rw-r--r--vmdb/plugins/chroot_plugin.py2
-rw-r--r--vmdb/plugins/debootstrap_plugin.py2
-rw-r--r--vmdb/plugins/grub_plugin.py1
-rw-r--r--vmdb/plugins/mkimg_plugin.py2
-rw-r--r--vmdb/plugins/qemudebootstrap_plugin.py2
-rw-r--r--vmdb/plugins/rootfs_cache_plugin.py4
6 files changed, 0 insertions, 13 deletions
diff --git a/vmdb/plugins/chroot_plugin.py b/vmdb/plugins/chroot_plugin.py
index e51227a..a7cda6d 100644
--- a/vmdb/plugins/chroot_plugin.py
+++ b/vmdb/plugins/chroot_plugin.py
@@ -53,8 +53,6 @@ class ShellStepRunner(vmdb.StepRunnerInterface):
shell = step['shell']
fs_tag = step['root-fs']
- vmdb.progress(
- 'run shell {}'.format(' '.join(shell.split('\n'))))
env = dict(os.environ)
env['ROOT'] = state.get_mount_point(fs_tag)
vmdb.runcmd(['sh', '-c', shell], env=env)
diff --git a/vmdb/plugins/debootstrap_plugin.py b/vmdb/plugins/debootstrap_plugin.py
index 9aa5b14..3411bb8 100644
--- a/vmdb/plugins/debootstrap_plugin.py
+++ b/vmdb/plugins/debootstrap_plugin.py
@@ -41,7 +41,5 @@ class DebootstrapStepRunner(vmdb.StepRunnerInterface):
variant = step.get('variant', '-')
if not (suite and tag and target and mirror):
raise Exception('missing arg for debootstrap step')
- vmdb.progress(
- 'Debootstrap {} {} {}'.format(suite, target, mirror))
vmdb.runcmd(['debootstrap', '--variant', variant, suite, target, mirror])
vmdb.runcmd_chroot(target, ['apt-get', 'update'])
diff --git a/vmdb/plugins/grub_plugin.py b/vmdb/plugins/grub_plugin.py
index bdbbe04..55411c6 100644
--- a/vmdb/plugins/grub_plugin.py
+++ b/vmdb/plugins/grub_plugin.py
@@ -220,7 +220,6 @@ class GrubStepRunner(vmdb.StepRunnerInterface):
return os.path.normpath(os.path.join(chroot, '.' + path))
def install_package(self, chroot, package):
- vmdb.progress('Install {} in chroot {}'.format(package, chroot))
env = os.environ.copy()
env['DEBIAN_FRONTEND'] = 'noninteractive'
vmdb.runcmd_chroot(
diff --git a/vmdb/plugins/mkimg_plugin.py b/vmdb/plugins/mkimg_plugin.py
index ea4830f..44fc57d 100644
--- a/vmdb/plugins/mkimg_plugin.py
+++ b/vmdb/plugins/mkimg_plugin.py
@@ -40,6 +40,4 @@ class MkimgStepRunner(vmdb.StepRunnerInterface):
def run(self, step, settings, state):
filename = step['mkimg']
size = step['size']
- vmdb.progress(
- 'Creating image file {} (size {})'.format(filename, size))
vmdb.runcmd(['qemu-img', 'create', '-f', 'raw', filename, size])
diff --git a/vmdb/plugins/qemudebootstrap_plugin.py b/vmdb/plugins/qemudebootstrap_plugin.py
index 4ea17ea..358790b 100644
--- a/vmdb/plugins/qemudebootstrap_plugin.py
+++ b/vmdb/plugins/qemudebootstrap_plugin.py
@@ -43,8 +43,6 @@ class QemuDebootstrapStepRunner(vmdb.StepRunnerInterface):
components = step.get('components', ['main'])
if not (suite and tag and target and mirror and arch):
raise Exception('missing arg for qemu-debootstrap step')
- vmdb.progress(
- 'Qemu-debootstrap {} {} {} {}'.format(suite, target, mirror, arch))
vmdb.runcmd(
['qemu-debootstrap',
'--arch', arch,
diff --git a/vmdb/plugins/rootfs_cache_plugin.py b/vmdb/plugins/rootfs_cache_plugin.py
index b0664fb..0d6df1c 100644
--- a/vmdb/plugins/rootfs_cache_plugin.py
+++ b/vmdb/plugins/rootfs_cache_plugin.py
@@ -49,8 +49,6 @@ class MakeCacheStepRunner(vmdb.StepRunnerInterface):
if not tar_path:
raise Exception('--rootfs-tarball MUST be set')
if not os.path.exists(tar_path):
- vmdb.progress(
- 'Caching contents of {} to {}'.format(rootdir, tar_path))
vmdb.runcmd(['tar'] + opts + ['-C', rootdir, '-caf', tar_path, '.'])
@@ -66,8 +64,6 @@ class UnpackCacheStepRunner(vmdb.StepRunnerInterface):
if not tar_path:
raise Exception('--rootfs-tarball MUST be set')
if os.path.exists(tar_path):
- vmdb.progress(
- 'Unpacking rootfs from {} to {}'.format(tar_path, rootdir))
vmdb.runcmd(
['tar', '-C', rootdir, '-xf', tar_path, '--numeric-owner'])
state.rootfs_unpacked = True