mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-24 19:22:13 +01:00
Code

- small fixes

Browse Source
This commit is contained in:
Marcus Huewe 2010-03-28 22:23:40 +02:00
parent 35d0652d21
commit ea3e5d20bf
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osc/build.py
View File

@ -699,13 +699,13 @@ def main(opts, argv):
vm_options += ' --swap ' + my_build_swap
if config['build-memory']:
vm_options += ' --memory ' + config['build-memory']
if config['build-vmdisk-autosetup'] and config['build-vmdisk-autosetup'] == '1':
if config['build-vmdisk-rootsize'] and config['build-vmdisk-swapsize']:
vm_options += ' --vmdisk-autosetup '
vm_options += ' --vmdisk-rootsize ' + config['build-vmdisk-rootsize']
vm_options += ' --vmdisk-swapsize ' + config['build-vmdisk-swapsize']
if config['build-vmdisk-force']:
vm_options += ' --vmdisk-force '
if config['build-vmdisk-autosetup']:
if config['build-vmdisk-rootsize'] and config['build-vmdisk-swapsize']:
vm_options += ' --vmdisk-autosetup '
vm_options += ' --vmdisk-rootsize ' + config['build-vmdisk-rootsize']
vm_options += ' --vmdisk-swapsize ' + config['build-vmdisk-swapsize']
if config['build-vmdisk-force']:
vm_options += ' --vmdisk-force '
print 'Running build'
cmd = '"%s" --root="%s" --rpmlist="%s" --dist="%s" %s --arch=%s %s "%s" %s' \

8
osc/conf.py
View File

@ -75,10 +75,10 @@ DEFAULTS = { 'apiurl': 'https://api.opensuse.org',
'build-device': '', # required for VM builds
'build-memory': '',# required for VM builds
'build-swap': '', # optional for VM builds
'build-vmdisk-autosetup': '', # optional for VM builds
'build-vmdisk-autosetup': '0', # optional for VM builds
'build-vmdisk-rootsize': '', # optional for VM builds
'build-vmdisk-swapsize': '', # optional for VM builds
'build-vmdisk-force': '', # optional for VM builds
'build-vmdisk-force': '0', # optional for VM builds
'build-jobs': os.sysconf('SC_NPROCESSORS_ONLN'), # compile with N jobs
'icecream': '0',
@ -133,7 +133,7 @@ config = DEFAULTS.copy()
boolean_opts = ['debug', 'do_package_tracking', 'http_debug', 'post_mortem', 'traceback', 'check_filelist', 'plaintext_passwd',
'checkout_no_colon', 'check_for_request_on_action', 'linkcontrol', 'show_download_progress', 'request_show_interactive',
'use_keyring', 'gnome_keyring']
'use_keyring', 'gnome_keyring', 'build-vmdisk-autosetup', 'build-vmdisk-force']
api_host_options = ['user', 'pass', 'passx', 'aliases', 'http_headers', 'email', 'sslcertck', 'cafile', 'capath', 'trusted_prj']
@ -184,7 +184,7 @@ apiurl = %(apiurl)s
# build-vmdisk-autosetup enabled the automatic creation of VM build disks
# possible values: 0 / 1
build-vmdisk-autosetup = 0
#build-vmdisk-autosetup = 0
# build-vmdisk-rootsize is the size of the disk-image used as root in a VM build
# values in MB - e.g. 4096