chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
makebuildserver: remove reference to f-droid.org/jessie64.box
[fdroidserver.git]
/
makebuildserver
diff --git
a/makebuildserver
b/makebuildserver
index e899100dd8ad7fe309f4d2316fb9dc095dd48f9a..27a952b8e4cd6de3ec3a0ea9e44e78a70f0d81c1 100755
(executable)
--- a/
makebuildserver
+++ b/
makebuildserver
@@
-58,8
+58,7
@@
logger.debug('cachedir set to: %s', cachedir)
config = {
'basebox': 'jessie64',
'baseboxurl': [
config = {
'basebox': 'jessie64',
'baseboxurl': [
- pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri(),
- 'https://f-droid.org/jessie64.box',
+ pathlib.Path(os.path.join(cachedir, 'jessie64.box')).as_uri()
],
'debian_mirror': 'http://http.debian.net/debian/',
'apt_package_cache': False,
],
'debian_mirror': 'http://http.debian.net/debian/',
'apt_package_cache': False,
@@
-525,9
+524,9
@@
def main():
debug_log_vagrant_vm(serverdir, config)
try:
v.up(provision=True)
debug_log_vagrant_vm(serverdir, config)
try:
v.up(provision=True)
- except
fdroidserver.vmtools.FDroidBuildVmException as e
:
+ except
subprocess.CalledProcessError
:
debug_log_vagrant_vm(serverdir, config)
debug_log_vagrant_vm(serverdir, config)
- logger.e
xception('could not bring buildserver vm up. %s', e
)
+ logger.e
rror("'vagrant up' failed, is the base box missing?"
)
sys.exit(1)
if config['copy_caches_from_host']:
sys.exit(1)
if config['copy_caches_from_host']: