Skip to content

Commit

Permalink
- handle architecture parsing also right when an emulator is used. Ju…
Browse files Browse the repository at this point in the history
…st warn in that case,

  because we can check for sure if an emulator is configured.
  • Loading branch information
adrianschroeter committed Feb 11, 2013
1 parent b358e70 commit d26b3df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion osc/build.py
Expand Up @@ -654,7 +654,7 @@ def main(apiurl, opts, argv):
elif hostarch != bi.buildarch:
if not bi.buildarch in can_also_build.get(hostarch, []):
# 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)
return 1
print >>sys.stderr, 'WARNING: It is guessed to build on hostarch \'%s\' for \'%s\' via QEMU.' % (hostarch, bi.buildarch)
Expand Down
6 changes: 3 additions & 3 deletions osc/commandline.py
Expand Up @@ -5100,10 +5100,10 @@ def parse_repoarchdescr(self, args, noinit = False, alternative_project = None,
if arg.endswith('.spec') or arg.endswith('.dsc') or arg.endswith('.kiwi') or arg == 'PKGBUILD':
arg_descr = arg
else:
if (arg in osc.build.can_also_build.get(osc.build.hostarch, [])
or arg in osc.build.qemu_can_build
or arg in osc.build.hostarch) and arg_arch is None:
if osc.build.can_also_build.get(arg) != None and arg_arch is None:
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:
arg_repository = arg
else:
Expand Down

0 comments on commit d26b3df

Please sign in to comment.