summaryrefslogtreecommitdiffstats
path: root/test/packaging/rpm/tagging.py
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-09-04 23:23:13 (GMT)
committerdirkbaechle <devnull@localhost>2012-09-04 23:23:13 (GMT)
commit1c8744b6d4ec8812746415d1aae4f13e634809ca (patch)
tree5d422a83251e4afe9a3941b3bb97a79fdb38765f /test/packaging/rpm/tagging.py
parenta54670d821ac18abc3880ef9ca03c2f84edd5ae6 (diff)
downloadSCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.zip
SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.gz
SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.bz2
- first swoop of changes for getting all Buildbot slaves to run successfully again
Diffstat (limited to 'test/packaging/rpm/tagging.py')
-rw-r--r--test/packaging/rpm/tagging.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/packaging/rpm/tagging.py b/test/packaging/rpm/tagging.py
index 6a242c6..4e43d93 100644
--- a/test/packaging/rpm/tagging.py
+++ b/test/packaging/rpm/tagging.py
@@ -33,6 +33,13 @@ import os
import TestSCons
machine = TestSCons.machine
+try:
+ # Try to get the actual machine type (like i586), since
+ # TestSCons maps all ix86 types to a i386 machine internally.
+ import os
+ machine = os.uname()[4]
+except AttributeError:
+ pass
_python_ = TestSCons._python_
test = TestSCons.TestSCons()