Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Closes #13803: Under Solaris, distutils doesn't include bitness in the directory name

This commit is contained in:
Jesus Cea 2012-01-18 03:51:38 +01:00
parent 25e76bdb69
commit 4a8ba19783
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/distutils/util.py
View File

@ -6,7 +6,7 @@ one of the other *util.py modules.
__revision__ = "$Id$" __revision__ = "$Id$"
import sys, os, string, re import sys, os, string, re, platform
from distutils.errors import DistutilsPlatformError from distutils.errors import DistutilsPlatformError
from distutils.dep_util import newer from distutils.dep_util import newer
from distutils.spawn import spawn from distutils.spawn import spawn
@ -76,6 +76,7 @@ def get_platform ():
if release[0] >= "5": # SunOS 5 == Solaris 2 if release[0] >= "5": # SunOS 5 == Solaris 2
osname = "solaris" osname = "solaris"
release = "%d.%s" % (int(release[0]) - 3, release[2:]) release = "%d.%s" % (int(release[0]) - 3, release[2:])
machine += ".%s" % platform.architecture()[0]
# fall through to standard osname-release-machine representation # fall through to standard osname-release-machine representation
elif osname[:4] == "irix": # could be "irix64"! elif osname[:4] == "irix": # could be "irix64"!
return "%s-%s" % (osname, release) return "%s-%s" % (osname, release)

3
Misc/NEWS
View File

@ -92,6 +92,9 @@ Library
- Issue #13589: Fix some serialization primitives in the aifc module. - Issue #13589: Fix some serialization primitives in the aifc module.
Patch by Oleg Plakhotnyuk. Patch by Oleg Plakhotnyuk.
- Issue #13803: Under Solaris, distutils doesn't include bitness
in the directory name.
- Issue #13642: Unquote before b64encoding user:password during Basic - Issue #13642: Unquote before b64encoding user:password during Basic
Authentication. Patch contributed by Joonas Kuorilehto and Michele Orrù. Authentication. Patch contributed by Joonas Kuorilehto and Michele Orrù.