chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c823491
)
makebuildserver: make config['domain'] local var where its needed
author
Hans-Christoph Steiner
<hans@eds.org>
Tue, 23 May 2017 09:59:53 +0000
(11:59 +0200)
committer
Hans-Christoph Steiner
<hans@eds.org>
Tue, 23 May 2017 18:08:29 +0000
(20:08 +0200)
makebuildserver
patch
|
blob
|
history
diff --git
a/makebuildserver
b/makebuildserver
index 0b3763346f6c5cbc0f427f25c45759b90d73829e..48e12f9ffaadc16f08466f111ec549ad8f8a135c 100755
(executable)
--- 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'
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)
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'])
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():
def main():