From b24d3aee1c80863cbb77713fea222c4242dff5ca Mon Sep 17 00:00:00 2001 From: Clark Williams Date: Thu, 15 Jul 2010 10:48:39 -0500 Subject: added i686 architecture Added i686 architecture to arch checking logic in py/mock.py Signed-off-by: Clark Williams --- py/mock.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/py/mock.py b/py/mock.py index b33d247..648c5ab 100755 --- a/py/mock.py +++ b/py/mock.py @@ -364,8 +364,9 @@ def set_config_opts_per_cmdline(config_opts, options, args): config_opts['online'] = options.online legal_arches = { - 'i386' : ('i386'), - 'x86_64' : ('i386', 'x86_64'), + 'i386' : ('i386', 'i686'), + 'i686' : ('i386', 'i686'), + 'x86_64' : ('i386', 'i686', 'x86_64'), 'ppc' : ('ppc'), 'ppc64' : ('ppc', 'ppc64'), 'sparc' : ('sparc'), @@ -379,7 +380,7 @@ def check_arch_combination(target_arch): try: if target_arch not in legal_arches[host_arch]: raise mock.exception.InvalidArchitecture( - "Cannot build target %d on arch %s" % (target_arch, host_arch)) + "Cannot build target %s on arch %s" % (target_arch, host_arch)) except KeyError: raise mock.exception.InvalidArchitecture( "Unknown target architcture: %s" % target_arch) -- cgit