From a01e302cdeebe3837adccbe8fded26ef4bbc7be0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 23 May 2017 11:59:53 +0200 Subject: [PATCH] makebuildserver: make config['domain'] local var where its needed --- makebuildserver | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makebuildserver b/makebuildserver index 0b376334..48e12f9f 100755 --- a/makebuildserver +++ b/makebuildserver @@ -80,7 +80,6 @@ if os.path.isfile('/usr/bin/systemd-detect-virt'): if virt == 'qemu' or virt == 'kvm' or virt == 'bochs': logger.info('Running in a VM guest, defaulting to QEMU/KVM via libvirt') config['vm_provider'] = 'libvirt' - config['domain'] = 'buildserver_default' elif virt != 'none': logger.info('Running in an unsupported VM guest (%s)!', virt) logger.debug('detected virt: %s', virt) @@ -402,8 +401,9 @@ def debug_log_vagrant_vm(vm_dir, config): if config['vm_provider'] == 'libvirt': logger.debug('> virsh -c qmeu:///system list --all') subprocess.call(['virsh', '-c', 'qemu:///system', 'list', '--all']) - logger.debug('> virsh -c qemu:///system snapshot-list %s', config['domain']) - subprocess.call(['virsh', '-c', 'qemu:///system', 'snapshot-list', config['domain']]) + domain = 'buildserver_default' + logger.debug('> virsh -c qemu:///system snapshot-list %s', domain) + subprocess.call(['virsh', '-c', 'qemu:///system', 'snapshot-list', domain]) def main(): -- 2.30.2