summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClark Williams <williams@redhat.com>2010-07-15 10:48:39 -0500
committerClark Williams <williams@redhat.com>2010-07-27 13:58:50 -0500
commitb24d3aee1c80863cbb77713fea222c4242dff5ca (patch)
tree6ce5a599fe7a095e3e6a7709f8860aefe0d04745
parent1d62c95bcfd1997db9204bde620c05d7dc76cf31 (diff)
downloadmock-b24d3aee1c80863cbb77713fea222c4242dff5ca.tar.gz
mock-b24d3aee1c80863cbb77713fea222c4242dff5ca.tar.xz
mock-b24d3aee1c80863cbb77713fea222c4242dff5ca.zip
added i686 architecture
Added i686 architecture to arch checking logic in py/mock.py Signed-off-by: Clark Williams <williams@redhat.com>
-rwxr-xr-xpy/mock.py7
1 files 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)