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:
45925c6
)
Work when cpu count is not defined
author
Ciaran Gultnieks
<ciaran@ciarang.com>
Mon, 23 Mar 2015 11:28:38 +0000
(11:28 +0000)
committer
Ciaran Gultnieks
<ciaran@ciarang.com>
Fri, 27 Mar 2015 20:49:43 +0000
(20:49 +0000)
makebuildserver
patch
|
blob
|
history
diff --git
a/makebuildserver
b/makebuildserver
index 6c49fa9a292a87da584d473186d31aabf70a95c6..ee4c348900c2bd63c1d2cd1f1962494c0db34839 100755
(executable)
--- a/
makebuildserver
+++ b/
makebuildserver
@@
-170,7
+170,7
@@
Vagrant.configure("2") do |config|
""".format(config['basebox'],
config['baseboxurl'],
config['memory'],
- config
['cpus'] or 1
)
+ config
.get('cpus', 1)
)
if 'aptproxy' in config and config['aptproxy']:
vagrantfile += """
config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'