diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-28 13:40:08 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-28 13:40:08 +0000 |
| commit | f3a30a2f3412b3528b2e7e05ecc57cdbc8c6e449 (patch) | |
| tree | 151f5e350ea9d0b6440e7d2d0a191bd779351b4e /morphlib/builder.py | |
| parent | 10bbea27a2b86dea661ead782557a4921b0b92e5 (diff) | |
| download | morph-f3a30a2f3412b3528b2e7e05ecc57cdbc8c6e449.tar.gz | |
Set sensible defaults for git-base-url, bundle-server, cachedir, max-jobs
Also, change builder.py to always obey the --max-jobs setting, unless
a morphology has a max-jobs field.
The defaults have been chosen so that they work for everyone equally
well. It may be useful to have a local mirror and then set the options
to point there, but it's not reasonable to try to guess such things,
so the defaults can be adapated to that.
Collect the defaults into one place so they're easier to overview.
The cliapp interface for adding settings is verbose enough that the
defaults were getting buried.
Diffstat (limited to 'morphlib/builder.py')
| -rw-r--r-- | morphlib/builder.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index 9b55e01f..79d2ef50 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -301,12 +301,9 @@ class ChunkBuilder(BlobBuilder): if self.blob.morph.max_jobs: max_jobs = int(self.blob.morph.max_jobs) logging.debug('max_jobs from morph: %s' % max_jobs) - elif self.settings['max-jobs']: + else: max_jobs = self.settings['max-jobs'] logging.debug('max_jobs from settings: %s' % max_jobs) - else: - max_jobs = morphlib.util.make_concurrency() - logging.debug('max_jobs from cpu count: %s' % max_jobs) self.ex.env['MAKEFLAGS'] = '-j%d' % max_jobs if not self.settings['no-ccache']: |