mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-27 12:42:12 +01:00
Code

- fixed indention

Browse Source 
- added 'icecream' to  config dict
This commit is contained in:
Marcus Huewe 2010-02-12 11:55:09 +01:00
parent d5ae3ef2b4
commit 8670d82fad
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osc/build.py
View File

@ -335,19 +335,18 @@ def main(opts, argv):
build_root = opts.root build_root = opts.root
if opts.jobs: if opts.jobs:
buildargs.append('--jobs %s' % opts.jobs) buildargs.append('--jobs %s' % opts.jobs)
else: elif config['build-jobs'] > 1:
if config['build-jobs'] > 1: buildargs.append('--jobs %s' % config['build-jobs'])
buildargs.append('--jobs %s' % config['build-jobs']) if opts.icecream or config['icecream']:
if opts.icecream or 'icecream' in config:
if opts.icecream: if opts.icecream:
num = opts.icecream num = opts.icecream
else: else:
num = config['icecream'] num = config['icecream']
if num > 0: if num > 0:
buildargs.append('--icecream %s' % num) buildargs.append('--icecream %s' % num)
xp.append('icecream') xp.append('icecream')
xp.append('gcc-c++') xp.append('gcc-c++')
if opts.ccache: if opts.ccache:
buildargs.append('--ccache') buildargs.append('--ccache')
xp.append('ccache') xp.append('ccache')

1
osc/conf.py
View File

@ -75,6 +75,7 @@ DEFAULTS = { 'apiurl': 'https://api.opensuse.org',
'build-memory': '',# required for VM builds 'build-memory': '',# required for VM builds
'build-swap': '', # optional for VM builds 'build-swap': '', # optional for VM builds
'build-jobs': os.sysconf('SC_NPROCESSORS_ONLN'), # compile with N jobs 'build-jobs': os.sysconf('SC_NPROCESSORS_ONLN'), # compile with N jobs
'icecream': '0',
'debug': '0', 'debug': '0',
'http_debug': '0', 'http_debug': '0',