[Python-checkins] cpython (merge 3.1 -> 3.2): Refinement by Stefan Krah (see issue 11715, msg133194) to exit early if the
barry.warsaw
python-checkins at python.org
Thu Apr 7 16:48:41 CEST 2011
http://hg.python.org/cpython/rev/3d7c9b38fbfd
changeset: 69186:3d7c9b38fbfd
branch: 3.2
parent: 69180:d29277949ad6
parent: 69185:c8738114b962
user: Barry Warsaw <barry at python.org>
date: Thu Apr 07 10:45:07 2011 -0400
summary:
Refinement by Stefan Krah (see issue 11715, msg133194) to exit early if the
dpkg-architecture command is not found on $PATH. This should fix the failures
on FreeBSD and Solaris, which do not create the target file via I/O
redirection if the command isn't found (unlike Linux and OS X which do).
files:
setup.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -373,6 +373,8 @@
def add_multiarch_paths(self):
# Debian/Ubuntu multiarch support.
# https://wiki.ubuntu.com/MultiarchSpec
+ if not find_executable('dpkg-architecture'):
+ return
tmpfile = os.path.join(self.build_temp, 'multiarch')
if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list