changeset: 74484:4a6e0b6d493b
parent: 74481:8d0ccb4ad206
parent: 74483:9d62f5aa35ff
user: Jesus Cea <jcea@jcea.es>
date: Wed Jan 18 04:28:05 2012 +0100
description:
MERGE: Emergency fix for #13803 bootstrap issue: Under Solaris, distutils doesn't include bitness in the directory name
diff -r 8d0ccb4ad206 -r 4a6e0b6d493b Lib/distutils/util.py
--- a/Lib/distutils/util.py	Wed Jan 18 04:01:24 2012 +0100
+++ b/Lib/distutils/util.py	Wed Jan 18 04:28:05 2012 +0100
@@ -9,7 +9,6 @@
 import imp
 import sys
 import string
-import platform
 from distutils.errors import DistutilsPlatformError
 from distutils.dep_util import newer
 from distutils.spawn import spawn
@@ -78,7 +77,11 @@
 if release[0]>= "5": # SunOS 5 == Solaris 2
 osname = "solaris"
 release = "%d.%s" % (int(release[0]) - 3, release[2:])
- machine += ".%s" % platform.architecture()[0]
+ # We can't use "platform.architecture()[0]" because a
+ # bootstrap problem. We use a dict to get an error
+ # if some suspicious happens.
+ bitness = {2147483647:"32bit", 9223372036854775807:"64bit"}
+ machine += ".%s" % bitness[sys.maxint]
 # fall through to standard osname-release-machine representation
 elif osname[:4] == "irix": # could be "irix64"!
 return "%s-%s" % (osname, release)
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/4a6e0b6d493b">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/4a6e0b6d493b" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>