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

- handle architecture parsing also right when an emulator is used. Just warn in that case,

Browse Source 
because we can check for sure if an emulator is configured.
This commit is contained in:
Adrian Schröter 2013-02-11 15:35:15 +01:00
parent b358e7085f
commit d26b3df32f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/build.py
View File

@ -654,7 +654,7 @@ def main(apiurl, opts, argv):
elif hostarch != bi.buildarch: elif hostarch != bi.buildarch:
if not bi.buildarch in can_also_build.get(hostarch, []): if not bi.buildarch in can_also_build.get(hostarch, []):
# OBSOLETE: qemu_can_build should not be needed anymore since OBS 2.3 # OBSOLETE: qemu_can_build should not be needed anymore since OBS 2.3
if vm_type != "emulator" and not bi.buildarch in qemu_can_build + system_emulator_can_build: if vm_type != "emulator" and not bi.buildarch in qemu_can_build:
print >>sys.stderr, 'Error: hostarch \'%s\' cannot build \'%s\'.' % (hostarch, bi.buildarch) print >>sys.stderr, 'Error: hostarch \'%s\' cannot build \'%s\'.' % (hostarch, bi.buildarch)
return 1 return 1
print >>sys.stderr, 'WARNING: It is guessed to build on hostarch \'%s\' for \'%s\' via QEMU.' % (hostarch, bi.buildarch) print >>sys.stderr, 'WARNING: It is guessed to build on hostarch \'%s\' for \'%s\' via QEMU.' % (hostarch, bi.buildarch)

6
osc/commandline.py
View File

@ -5100,10 +5100,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg == 'PKGBUILD': if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg == 'PKGBUILD':
arg_descr = arg arg_descr = arg
else: else:
if (arg in osc.build.can_also_build.get(osc.build.hostarch, []) if osc.build.can_also_build.get(arg) != None and arg_arch is None:
or arg in osc.build.qemu_can_build
or arg in osc.build.hostarch) and arg_arch is None:
arg_arch = arg arg_arch = arg
if not (arg in osc.build.can_also_build.get(osc.build.hostarch, []) or arg in osc.build.hostarch):
print "WARNING: native compile is not possible, an emulator must be configured!"
elif not arg_repository: elif not arg_repository:
arg_repository = arg arg_repository = arg
else: else: